Changeset 108355 in vbox

Timestamp:

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

Author:

vboxsync

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

167715

Message:

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

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (2 diffs)
• include/UnattendedImpl.h (modified) (2 diffs)
• src-server/UnattendedImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -5037 +5037 @@
   <interface
     name="IUnattended" extends="$unknown"
-    uuid="a71e5822-365b-49ba-bd14-c8d616e6740d"
+    uuid="39d1f56c-c1c2-40df-84e9-468062d84768"
     wsmap="managed"
     rest="managed"
@@ -5135 +5135 @@
         distribution, only the installation of additions pointed to by
         <link to="IUnattended::additionsIsoPath"/>.
+      </desc>
+    </attribute>
+
+    <attribute name="productKeyRequired" type="boolean"  readonly="yes">
+      <desc>
+        Indicates whether the product key is required for the installation.
       </desc>
     </attribute>

trunk/src/VBox/Main/include/UnattendedImpl.h

@@ -158 +158 @@
 
     bool            mfDoneDetectIsoOS;         /**< Set by detectIsoOS(), cleared by setIsoPath(). */
+    bool            mfProductKeyRequired;
     Utf8Str         mStrDetectedOSTypeId;
     Utf8Str         mStrDetectedOSVersion;
@@ -214 +215 @@
     HRESULT getInstallGuestAdditions(BOOL *installGuestAdditions);
     HRESULT setInstallGuestAdditions(BOOL installGuestAdditions);
+    HRESULT getProductKeyRequired(BOOL *productKeyRequired);
     HRESULT getValidationKitIsoPath(com::Utf8Str &aValidationKitIsoPath);
     HRESULT setValidationKitIsoPath(const com::Utf8Str &aValidationKitIsoPath);

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;
 }