Changeset 93529 in vbox for trunk/src

Timestamp:

Feb 1, 2022 12:23:58 PM (3 years ago)

Author:

vboxsync

Message:

Main/Unattended: bugref:9781. Adding an attribute to Unattended interface for detected image names.

Location:

trunk/src/VBox/Main

Files:

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

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

@@ -5006 +5006 @@
     </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.
+      </desc>
+    </attribute>
+
     <method name="detectIsoOS">
       <desc>

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

@@ -222 +222 @@
     HRESULT getDetectedOSFlavor(com::Utf8Str &aDetectedOSFlavor);
     HRESULT getDetectedOSHints(com::Utf8Str &aDetectedOSHints);
+    HRESULT getDetectedImageNames(std::vector<com::Utf8Str> &aDetectedImageNames);
     //internal functions
 

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

@@ -3064 +3064 @@
     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;
@@ -3210 +3211 @@
 }
 
+HRESULT Unattended::getDetectedImageNames(std::vector<com::Utf8Str> &aDetectedImageNames)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    aDetectedImageNames.clear();
+    for (size_t i = 0; i < mDetectedImages.size(); ++i)
+        aDetectedImageNames.push_back(mDetectedImages[i].getNameAndVersion());
+    return S_OK;
+}
+
 /*
  * Getters that the installer and script classes can use.