Changeset 93558 in vbox for trunk/src/VBox

Timestamp:

Feb 2, 2022 11:51:45 PM (3 years ago)

Author:

vboxsync

Message:

VBoxManage/unattended: List detected windows images. bugref:9781

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp

@@ -1567 +1567 @@
     Bstr bstrDetectedHints;
     CHECK_ERROR2_RET(hrc, ptrUnattended, COMGETTER(DetectedOSHints)(bstrDetectedHints.asOutParam()), RTEXITCODE_FAILURE);
+    SafeArray<BSTR> aImageNames;
+    CHECK_ERROR2_RET(hrc, ptrUnattended, COMGETTER(DetectedImageNames)(ComSafeArrayAsOutParam(aImageNames)), RTEXITCODE_FAILURE);
+    SafeArray<ULONG> aImageIndices;
+    CHECK_ERROR2_RET(hrc, ptrUnattended, COMGETTER(DetectedImageIndices)(ComSafeArrayAsOutParam(aImageIndices)), RTEXITCODE_FAILURE);
+    Assert(aImageNames.size() == aImageIndices.size());
+
     if (fMachineReadable)
-        RTPrintf("OSTypeId=\"%ls\"\n"
-                 "OSVersion=\"%ls\"\n"
-                 "OSFlavor=\"%ls\"\n"
-                 "OSLanguages=\"%ls\"\n"
-                 "OSHints=\"%ls\"\n",
-                 bstrDetectedOSTypeId.raw(),
-                 bstrDetectedVersion.raw(),
-                 bstrDetectedFlavor.raw(),
-                 bstrDetectedLanguages.raw(),
-                 bstrDetectedHints.raw());
+    {
+        outputMachineReadableString("OSTypeId", &bstrDetectedOSTypeId);
+        outputMachineReadableString("OSVersion", &bstrDetectedVersion);
+        outputMachineReadableString("OSFlavor", &bstrDetectedFlavor);
+        outputMachineReadableString("OSLanguages", &bstrDetectedLanguages);
+        outputMachineReadableString("OSHints", &bstrDetectedHints);
+        for (size_t i = 0; i < aImageNames.size(); i++)
+        {
+            Bstr const bstrName = aImageNames[i];
+            outputMachineReadableStringWithFmtName(&bstrName, false, "ImageIndex%u", aImageIndices[i]);
+        }
+    }
     else
     {
@@ -1591 +1599 @@
                  bstrDetectedLanguages.raw(),
                  bstrDetectedHints.raw());
+        for (size_t i = 0; i < aImageNames.size(); i++)
+            RTPrintf("    Image #%-3u   = %ls\n", aImageIndices[i], aImageNames[i]);
     }
 
@@ -1921 +1931 @@
     SHOW_STR_ATTR(DetectedOSLanguages,           "detectedOSLanguages");
     SHOW_STR_ATTR(DetectedOSHints,               "detectedOSHints");
+    {
+        ULONG idxImage = 0;
+        HRESULT hrc2 = ptrUnattended->COMGETTER(ImageIndex)(&idxImage);
+        if (FAILED(hrc2))
+            idxImage = 0;
+        SafeArray<BSTR> aImageNames;
+        hrc2 = ptrUnattended->COMGETTER(DetectedImageNames)(ComSafeArrayAsOutParam(aImageNames));
+        if (SUCCEEDED(hrc2))
+        {
+            SafeArray<ULONG> aImageIndices;
+            hrc2 = ptrUnattended->COMGETTER(DetectedImageIndices)(ComSafeArrayAsOutParam(aImageIndices));
+            if (SUCCEEDED(hrc2))
+            {
+                Assert(aImageNames.size() == aImageIndices.size());
+                for (size_t i = 0; i < aImageNames.size(); i++)
+                {
+                    char szTmp[64];
+                    RTStrPrintf(szTmp, sizeof(szTmp), "detectedImage[%u]%s", i, idxImage != aImageIndices[i] ? "" : "*");
+                    RTPrintf("  %32s = #%u: %ls\n", szTmp, aImageIndices[i], aImageNames[i]);
+                }
+            }
+            else
+                RTPrintf(Misc::tr("  %32s = failed: %Rhrc\n"), "detectedImageIndices", hrc2);
+        }
+        else
+            RTPrintf(Misc::tr("  %32 = failed: %Rhrc\n"), "detectedImageNames", hrc2);
+    }
 
 #undef SHOW_STR_ATTR