Changeset 93578 in vbox for trunk/src/VBox

Timestamp:

Feb 3, 2022 12:39:56 PM (3 years ago)

Author:

vboxsync

Message:

Main/Unattended: Get the image architecture if we can. bugref:9781

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

@@ -39 +39 @@
     Utf8Str  mName;
     Utf8Str  mVersion;
+    Utf8Str  mArch;
     uint32_t mImageIndex;
     Utf8Str  getNameAndVersion() const;

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

@@ -193 +193 @@
 Utf8Str WIMImage::getNameAndVersion() const
 {
+    if (mVersion.isEmpty() && mArch.isEmpty())
+        return mName;
+    if (mArch.isEmpty())
+        return Utf8StrFmt("%s (%s)", mName.c_str(), mVersion.c_str());
     if (mVersion.isEmpty())
-        return mName;
-    return Utf8StrFmt("%s (%s)", mName.c_str(), mVersion.c_str());
+        return Utf8StrFmt("%s (%s)", mName.c_str(), mArch.c_str());
+    return Utf8StrFmt("%s (%s / %s)", mName.c_str(), mVersion.c_str(), mArch.c_str());
 }
 
@@ -587 +591 @@
             if (pElmArch)
             {
-                const char *pszValue = pElmArch->getValue();
-                if (pszValue && *pszValue)
+                const char *pszArch = pElmArch->getValue();
+                if (pszArch && *pszArch)
                 {
                     uint32_t uArch;
-                    int vrc = RTStrToUInt32Ex(pszValue, NULL, 10 /*uBase*/, &uArch);
-                    if (RT_SUCCESS(vrc) && vrc != VWRN_NUMBER_TOO_BIG && vrc != VWRN_NEGATIVE_UNSIGNED)
-                    {
-
-                    }
+                    int vrc = RTStrToUInt32Ex(pszArch, NULL, 10 /*uBase*/, &uArch);
+                    if (   RT_SUCCESS(vrc)
+                        && vrc != VWRN_NUMBER_TOO_BIG
+                        && vrc != VWRN_NEGATIVE_UNSIGNED
+                        && uArch < RT_ELEMENTS(s_apszArchs))
+                        newImage.mArch = s_apszArchs[uArch];
+                    else
+                        LogRel(("Unattended: bogus ARCH element value: '%s'\n", pszArch));
                 }
             }