Changeset 93534 in vbox for trunk/src

Timestamp:

Feb 1, 2022 4:46:52 PM (3 years ago)

Author:

vboxsync

Message:

Main/Unattended: bugref:9781. Adding an atribute to IUnattended for image indices.

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (3 diffs)
• include/UnattendedImpl.h (modified) (1 diff)
• src-server/UnattendedImpl.cpp (modified) (3 diffs)
• testcase/tstUnattendedScript.cpp (modified) (1 diff)

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

@@ -4674 +4674 @@
   <interface
     name="IUnattended" extends="$unknown"
-    uuid="6f89464f-7193-426c-a41f-522e8e537fa0"
+    uuid="6f89464f-7193-426c-a41f-522e4e537fa0"
     wsmap="managed"
     reservedMethods="4" reservedAttributes="16"
@@ -4896 +4896 @@
     <attribute name="imageIndex" type="unsigned long">
       <desc>
-        The image index on installation CD/DVD used to install.
+        The image index on installation CD/DVD used to install. This index should be
+        one of the indices of <link to="IUnattended::detectedImageIndices"/>.
 
         Used only with Windows installation CD/DVD:
@@ -5005 +5006 @@
       </desc>
     </attribute>
-
     <attribute name="detectedImageNames" type="wstring" readonly="yes" safearray="yes">
       <desc>
-        A list of names of the images detected from install.wim file of a Windows ISO.
+        A list of names of the images detected from install.wim file of a Windows ISO. This
+        array is parallel to <link to="IUnattended::detectedImageIndices"/>.
+      </desc>
+    </attribute>
+    <attribute name="detectedImageIndices" type="unsigned long" readonly="yes" safearray="yes">
+      <desc>
+        A list of names of the images detected from install.wim file of a Windows ISO. This array
+        is parallel to <link to="IUnattended::detectedImageNames"/>. <link to="IUnattended::imageIndex"/>
+        should be one of these indices.
       </desc>
     </attribute>

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

@@ -224 +224 @@
     HRESULT getDetectedOSHints(com::Utf8Str &aDetectedOSHints);
     HRESULT getDetectedImageNames(std::vector<com::Utf8Str> &aDetectedImageNames);
+    HRESULT getDetectedImageIndices(std::vector<uint32_t> &aDetectedImageIndices);
     //internal functions
 

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

@@ -517 +517 @@
         if (newImage.mName.isEmpty())
             continue;
+
         newImage.mImageIndex = pu32;
         const ElementNode *pVersionElement = pChild->findChildElement("VERSION");
@@ -3077 +3078 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
     AssertReturn(mpInstaller == NULL, setErrorBoth(E_FAIL, VERR_WRONG_ORDER, tr("Cannot change after prepare() has been called")));
-    AssertReturn(index < mDetectedImages.size(), setErrorBoth(E_FAIL, VERR_OUT_OF_RANGE, tr("Image index is larger than the number of detected images")));
-    midxImage = index;
-    return S_OK;
+    /* Set midxImage only if mDetectedImages includes an image with an index equal to @param index. */
+    for (size_t i = 0; i < mDetectedImages.size(); ++i)
+    {
+        if (mDetectedImages[i].mImageIndex == index)
+        {
+                midxImage = index;
+                return S_OK;
+        }
+    }
+    return VERR_INVALID_PARAMETER;
 }
 
@@ -3233 +3241 @@
 }
 
+HRESULT Unattended::getDetectedImageIndices(std::vector<uint32_t> &aDetectedImageIndices)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    aDetectedImageIndices.clear();
+    for (size_t i = 0; i < mDetectedImages.size(); ++i)
+        aDetectedImageIndices.push_back(mDetectedImages[i].mImageIndex);
+    return S_OK;
+}
+
 /*
  * Getters that the installer and script classes can use.

trunk/src/VBox/Main/testcase/tstUnattendedScript.cpp

@@ -445 +445 @@
 }
 
+HRESULT Unattended::getDetectedImageIndices(std::vector<uint32_t> &aDetectedImageIndices)
+{
+    RT_NOREF(aDetectedImageIndices);
+    return E_NOTIMPL;
+}
+
 /*
  * Getters that the installer and script classes can use.