Changeset 93533 in vbox for trunk/src

Timestamp:

Feb 1, 2022 2:07:44 PM (3 years ago)

Author:

vboxsync

Message:

Main/Unattended: bugref:9781. Reading and storing image index from the xml metadata.

Location:

trunk/src/VBox/Main

Files:

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

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

@@ -37 +37 @@
 struct WIMImage
 {
-    Utf8Str mName;
-    Utf8Str mVersionMajor;
-    Utf8Str mVersionMinor;
-    Utf8Str mVersionBuild;
-    Utf8Str getNameAndVersion() const;
+    Utf8Str  mName;
+    Utf8Str  mVersionMajor;
+    Utf8Str  mVersionMinor;
+    Utf8Str  mVersionBuild;
+    uint32_t mImageIndex;
+    Utf8Str  getNameAndVersion() const;
 };
 

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

@@ -496 +496 @@
         if (!pChild)
             continue;
+
+        const char *pszIndex = pChild->findAttributeValue("INDEX");
+        if (!pszIndex)
+            pszIndex = pChild->findAttributeValue("index");
+        if (!pszIndex)
+            continue;
+        uint32_t pu32 = 0;
+        int vrc = RTStrToUInt32Full(pszIndex, 10 /* uBase */, &pu32);
+
+        if (!RT_SUCCESS(vrc))
+            continue;
+
         const ElementNode *pDisplayDescriptionNode = pChild->findChildElement("DISPLAYNAME");
         if (!pDisplayDescriptionNode)
@@ -505 +517 @@
         if (newImage.mName.isEmpty())
             continue;
+        newImage.mImageIndex = pu32;
         const ElementNode *pVersionElement = pChild->findChildElement("VERSION");
         if (!pVersionElement)