Changeset 108355 in vbox for trunk/src/VBox/Main/src-server/UnattendedImpl.cpp

Timestamp:

Feb 24, 2025 3:20:00 PM (3 months ago)

Author:

vboxsync

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

167715

Message:

Unattended: bugref:10864. For Windows11 the product key is required.

File:

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

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

@@ -26 +26 @@
  */
 
+#include <cstdio>
+
 
 /*********************************************************************************************************************************
@@ -260 +262 @@
     , mfInstallGuestAdditions(false), mfInstallTestExecService(false), mfInstallUserPayload(false)
     , mpTimeZoneInfo(NULL), mfIsDefaultAuxiliaryBasePath(true), midxImage(0), mfDoneDetectIsoOS(false)
-    , mEnmOsType(VBOXOSTYPE_Unknown)
+    , mfProductKeyRequired(false), mEnmOsType(VBOXOSTYPE_Unknown)
     , mfAvoidUpdatesOverNetwork(false), mfDoneSupportedGuestOSList(false)
 { }
@@ -363 +365 @@
     mStrDetectedOSHints.setNull();
     mDetectedImages.clear();
+    mfProductKeyRequired = false;
 
     /*
@@ -497 +500 @@
         }
     }
-
+    if (mStrDetectedOSTypeId.startsWithI("windows11"))
+        mfProductKeyRequired = true;
     /* Check if detected OS type is supported (covers platform architecture). */
     bool fSupported = false;
@@ -2634 +2638 @@
     if ((Machine *)ptrMachine != (Machine *)mMachine)
         return setErrorBoth(E_FAIL, VERR_WRONG_ORDER, tr("The 'machine' while we were using it - please don't do that"));
-
+    /* Check if required product key is set. */
+    if (mfProductKeyRequired && mStrProductKey.isEmpty())
+        return setErrorBoth(E_FAIL, VERR_MISSING, tr("Product key is required for this kind of OS"));
     /*
      * Check if the specified ISOs and files exist.
@@ -3598 +3604 @@
     AssertReturn(mpInstaller == NULL, setErrorBoth(E_FAIL, VERR_WRONG_ORDER, tr("Cannot change after prepare() has been called")));
     mfInstallGuestAdditions = installGuestAdditions != FALSE;
+    return S_OK;
+}
+
+HRESULT Unattended::getProductKeyRequired(BOOL *productKeyRequired)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    *productKeyRequired = mfProductKeyRequired;
     return S_OK;
 }