Changeset 93577 in vbox

Timestamp:

Feb 3, 2022 12:35:45 PM (3 years ago)

Author:

vboxsync

Message:

Main/Unattended: The image version is inside the WINDOWS element, not directly under IMAGE. Pick up SPBUILD and combine them all into a single version string. Be stricter with the image index parsing (via getAttributeValue override). Catch alloc exceptions. bugref:9781

Location:

trunk

Files:

• include/iprt/formats/wim.h (modified) (1 diff)
• src/VBox/Main/src-server/UnattendedImpl.cpp (modified) (2 diffs)

trunk/include/iprt/formats/wim.h

@@ -62 +62 @@
     /** 0x10 - The uncompressed original size.
      * @note This is signed in the specficiation...  */
-    uint64_t        cbOrginal;
+    uint64_t        cbOriginal;
 } RESHDRDISKSHORT;
 AssertCompileSize(RESHDRDISKSHORT, 0x18);

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

@@ -503 +503 @@
  *         <DISPLAYNAME>Windows 10 Home</DISPLAYNAME>
  *         <WINDOWS>
+ *             <ARCH>NN</ARCH>
  *             <VERSION>
  *                 ...
@@ -558 +559 @@
             if (pVersionElement)
                 parseVersionElement(pVersionElement, newImage);
+
+            /* The ARCH element contains a number from the
+               PROCESSOR_ARCHITECTURE_XXX set of defines in winnt.h: */
+            static const char * const s_apszArchs[] =
+            {
+                /* PROCESSOR_ARCHITECTURE_INTEL         / [0]  = */ "x86",
+                /* PROCESSOR_ARCHITECTURE_MIPS          / [1]  = */ "mips",
+                /* PROCESSOR_ARCHITECTURE_ALPHA         / [2]  = */ "alpha",
+                /* PROCESSOR_ARCHITECTURE_PPC           / [3]  = */ "ppc",
+                /* PROCESSOR_ARCHITECTURE_SHX           / [4]  = */ "shx",
+                /* PROCESSOR_ARCHITECTURE_ARM           / [5]  = */ "arm32",
+                /* PROCESSOR_ARCHITECTURE_IA64          / [6]  = */ "ia64",
+                /* PROCESSOR_ARCHITECTURE_ALPHA64       / [7]  = */ "alpha64",
+                /* PROCESSOR_ARCHITECTURE_MSIL          / [8]  = */ "msil",
+                /* PROCESSOR_ARCHITECTURE_AMD64         / [9]  = */ "x64",
+                /* PROCESSOR_ARCHITECTURE_IA32_ON_WIN64 / [10] = */ "x86-on-x64",
+                /* PROCESSOR_ARCHITECTURE_NEUTRAL       / [11] = */ "noarch",
+                /* PROCESSOR_ARCHITECTURE_ARM64         / [12] = */ "arm64",
+                /* PROCESSOR_ARCHITECTURE_ARM32_ON_WIN64/ [13] = */ "arm32-on-arm64",
+                /* PROCESSOR_ARCHITECTURE_IA32_ON_ARM64 / [14] = */ "x86-on-arm32",
+            };
+            const ElementNode *pElmArch = pElmWindows->findChildElement("ARCH");
+            if (!pElmArch)
+                pElmArch = pElmWindows->findChildElement("arch");
+            if (!pElmArch)
+                pElmArch = pElmWindows->findChildElement("Arch");
+            if (pElmArch)
+            {
+                const char *pszValue = pElmArch->getValue();
+                if (pszValue && *pszValue)
+                {
+                    uint32_t uArch;
+                    int vrc = RTStrToUInt32Ex(pszValue, NULL, 10 /*uBase*/, &uArch);
+                    if (RT_SUCCESS(vrc) && vrc != VWRN_NUMBER_TOO_BIG && vrc != VWRN_NEGATIVE_UNSIGNED)
+                    {
+
+                    }
+                }
+            }
         }