Changeset 93584 in vbox for trunk/src/VBox

Timestamp:

Feb 3, 2022 2:49:19 PM (3 years ago)

Author:

vboxsync

Message:

Main/Unattended: Update detectedOS* attributes when setting imageIndex and we've detectedImages info handy. Ditto for prepare() and detectIsoOS(). Parse LANGUAGES from the XML data in install.xim. Stop windows detection if we seems to have found the necessary info in the XML section of install.wim. bugref:9781

Location:

trunk/src/VBox/Main

Files:

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

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

@@ -4899 +4899 @@
         one of the indices of <link to="IUnattended::detectedImageIndices"/>.
 
+        Changing this after ISO detection may cause
+        <link to="IUnattended::detectedOSTypeId"/>, <link to="IUnattended::detectedOSVersion"/>,
+        <link to="IUnattended::detectedOSFlavor"/>, <link to="IUnattended::detectedOSLanguages"/>,
+        and <link to="IUnattended::detectedOSHints"/> to be updated with values
+        specific to the selected image.
+
         Used only with Windows installation CD/DVD:
         https://technet.microsoft.com/en-us/library/cc766022%28v=ws.10%29.aspx
@@ -5037 +5043 @@
         Prepare for running the unattended process of installation.
 
-        This will instantiate the installer based on the guest type associated
-        with the machine (see <link to="IMachine::OSTypeId"/>).  It will also
-        perform <link to="IUnattended::detectIsoOS"/> if not yet called on the
-        current <link to="IUnattended::isoPath"/> value.
+        This will perform <link to="IUnattended::detectIsoOS"/> if not yet called on the
+        current <link to="IUnattended::isoPath"/> value.  It may then may cause
+        <link to="IUnattended::detectedOSTypeId"/>, <link to="IUnattended::detectedOSVersion"/>,
+        <link to="IUnattended::detectedOSFlavor"/>, <link to="IUnattended::detectedOSLanguages"/>,
+        and <link to="IUnattended::detectedOSHints"/> to be updated with values
+        specific to the image selected by <link to="IUnattended::imageIndex"/> if the ISO
+        contains images.
+
+        This method will then instantiate the installer based on the detected guest type
+        (see <link to="IUnattended::detectedOSTypeId"/>).
       </desc>
     </method>

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

@@ -287 +287 @@
      */
     bool i_isGuestOSArchX64(Utf8Str const &rStrGuestOsTypeId);
+
+    /**
+     * Updates the detected attributes when the image index or image list changes.
+     *
+     * @returns true if we've got all necessary stuff for a successful detection.
+     */
+    bool i_updateDetectedAttributeForImage(WIMImage const &rImage);
+
 };
 

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

@@ -551 +551 @@
         {
             rImage.mArch   = s_aArches[uArch].pszArch;
-            rImage.mOSType = (VBOXOSTYPE)(s_aArches[uArch].enmArch | (rImage.mOSType & VBOXOSTYPE_ArchitectureMask));
+            rImage.mOSType = (VBOXOSTYPE)(s_aArches[uArch].enmArch | (rImage.mOSType & VBOXOSTYPE_OsTypeMask));
         }
         else
@@ -765 +765 @@
     // sources/lang.ini       - ditto.
 
+    /*
+     * The install.wim file contains an XML document describing the install
+     * images it contains.  This includes all the info we need for a successful
+     * detection.
+     */
     RTVFSFILE hVfsFile;
-    /** @todo look at the install.wim file too, extracting the XML (easy) and
-     *        figure out the available image numbers and such. The format is
-     *        documented. It would also provide really accurate Windows
-     *        version information without the need to guess. The current
-     *        content of mStrDetectedOSVersion is mostly useful for human
-     *        consumption. ~~Long term it should be possible to have version
-     *        conditionals (expr style, please) in the templates, which
-     *        would make them a lot easier to write and more flexible at the
-     *        same time. - done already~~
-     *
-     * Here is how to list images inside an install.wim file from powershell:
-     * https://docs.microsoft.com/en-us/powershell/module/dism/get-windowsimage?view=windowsserver2022-ps
-     *
-     * Unfortunately, powershell is not available by default on non-windows hosts, so we
-     * have to do it ourselves of course, but this can help when coding & testing.
-     */
-
     int vrc = RTVfsFileOpen(hVfsIso, "sources/install.wim", RTFILE_O_READ | RTFILE_O_DENY_NONE | RTFILE_O_OPEN, &hVfsFile);
     if (RT_SUCCESS(vrc))
@@ -839 +827 @@
                                 try
                                 {
+                                    mDetectedImages.clear(); /* debugging convenience  */
                                     parseWimXMLData(pElmRoot, mDetectedImages);
                                 }
@@ -844 +833 @@
                                 {
                                     vrc = VERR_NO_MEMORY;
+                                }
+
+                                /*
+                                 * If we found images, update the detected info attributes.
+                                 */
+                                if (RT_SUCCESS(vrc) && mDetectedImages.size() > 0)
+                                {
+                                    size_t i;
+                                    for (i = 0; i < mDetectedImages.size(); i++)
+                                        if (mDetectedImages[i].mImageIndex == midxImage)
+                                            break;
+                                    if (i >= mDetectedImages.size())
+                                        i = 0; /* use the first one if midxImage wasn't found */
+                                    if (i_updateDetectedAttributeForImage(mDetectedImages[i]))
+                                    {
+                                        LogRel2(("Unattended: happy with mDetectedImages[%u]\n", i));
+                                        *penmOsType = mDetectedImages[i].mOSType;
+                                        return S_OK;
+                                    }
                                 }
                             }
@@ -2171 +2179 @@
             if (midxImage == mDetectedImages[i].mImageIndex)
             {
+                i_updateDetectedAttributeForImage(mDetectedImages[i]);
                 fImageFound = true;
-                /** @todo Replace / amend the detected version? */
                 break;
             }
@@ -3341 +3349 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
     AssertReturn(mpInstaller == NULL, setErrorBoth(E_FAIL, VERR_WRONG_ORDER, tr("Cannot change after prepare() has been called")));
+
+    /* Validate the selection if detection was done already: */
+    if (mDetectedImages.size() > 0)
+    {
+        for (size_t i = 0; i < mDetectedImages.size(); i++)
+            if (mDetectedImages[i].mImageIndex == index)
+            {
+                midxImage = index;
+                i_updateDetectedAttributeForImage(mDetectedImages[i]);
+                return S_OK;
+            }
+        LogRel(("Unattended: Setting invalid index=%u\n", index)); /** @todo fail? */
+    }
+
     midxImage = index;
     return S_OK;
@@ -3736 +3758 @@
     return false;
 }
+
+
+bool Unattended::i_updateDetectedAttributeForImage(WIMImage const &rImage)
+{
+    bool fRet = true;
+
+    /*
+     * If the image doesn't have a valid value, we don't change it.
+     * This is obviously a little bit bogus, but what can we do...
+     */
+    const char *pszOSTypeId = Global::OSTypeId(rImage.mOSType);
+    if (pszOSTypeId && strcmp(pszOSTypeId, "Other") != 0)
+        mStrDetectedOSTypeId = pszOSTypeId;
+    else
+        fRet = false;
+
+    if (rImage.mVersion.isNotEmpty())
+        mStrDetectedOSVersion = rImage.mVersion;
+    else
+        fRet = false;
+
+    if (rImage.mLanguages.size() > 0)
+        mDetectedOSLanguages  = rImage.mLanguages;
+    else
+        fRet = false;
+
+    return fRet;
+}
+