Changeset 93587 in vbox

Timestamp:

Feb 3, 2022 3:40:21 PM (3 years ago)

Author:

vboxsync

Message:

Main/Unattended: Set IMAGE/WINDOWS/EDITIONID (or IMAGE/FLAGS absent) as detectedOSFlavor for windows ISOs with install.wim/XML. bugref:9781

Location:

trunk/src/VBox/Main

Files:

• include/UnattendedImpl.h (modified) (1 diff)
• src-server/UnattendedImpl.cpp (modified) (4 diffs)

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

@@ -40 +40 @@
     Utf8Str  mVersion;
     Utf8Str  mArch;
+    Utf8Str  mFlavor;
     RTCList<RTCString, RTCString *> mLanguages;
     Utf8Str  mDefaultLanguage;

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

@@ -197 +197 @@
 const Utf8Str &WIMImage::formatName(Utf8Str &r_strName) const
 {
+    /* We skip the mFlavor as it's typically part of the description already. */
+
     if (mVersion.isEmpty() && mArch.isEmpty() && mDefaultLanguage.isEmpty() && mLanguages.size() == 0)
         return mName;
@@ -719 +721 @@
             || (pElmWindows = pChild->findChildElement("Windows")) != NULL)
         {
+            /* Do edition/flags before the version so it can better determin
+               the OS version enum value.  Old windows version (vista) typically
+               doesn't have an EDITIONID element, so fall back on the FLAGS element
+               under IMAGE as it is pretty similar (case differences). */
+            const ElementNode *pElmEditionId;
+            if (   (pElmEditionId = pElmWindows->findChildElement("EDITIONID")) != NULL
+                || (pElmEditionId = pElmWindows->findChildElement("editionid")) != NULL
+                || (pElmEditionId = pElmWindows->findChildElement("Editionid")) != NULL
+                || (pElmEditionId = pElmWindows->findChildElement("EditionId")) != NULL
+                || (pElmEditionId = pChild->findChildElement("FLAGS")) != NULL
+                || (pElmEditionId = pChild->findChildElement("flags")) != NULL
+                || (pElmEditionId = pChild->findChildElement("Flags")) != NULL)
+                if (   pElmEditionId->getValue()
+                    && *pElmEditionId->getValue() != '\0')
+                    newImage.mFlavor = pElmEditionId->getValue();
+
             const ElementNode *pElmVersion;
             if (   (pElmVersion = pElmWindows->findChildElement("VERSION")) != NULL
@@ -740 +758 @@
                 parseLangaguesElement(pElmLang, newImage);
         }
+
 
         imageList.append(newImage);
@@ -3779 +3798 @@
         fRet = false;
 
+    if (rImage.mFlavor.isNotEmpty())
+        mStrDetectedOSFlavor = rImage.mFlavor;
+    else
+        fRet = false;
+
     if (rImage.mLanguages.size() > 0)
         mDetectedOSLanguages  = rImage.mLanguages;