Changeset 101381 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Oct 6, 2023 10:00:59 AM (16 months ago)

Author:

vboxsync

Message:

Main: More guest OS id marking. bugref:10384

Location:

trunk/src/VBox/Main/src-client

Files:

• ConsoleImplConfigX86.cpp (modified) (6 diffs)
• GuestSessionImplTasks.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/ConsoleImplConfigX86.cpp

@@ -680 +680 @@
     BOOL fW9xGuest = FALSE;
     BOOL fDosGuest = FALSE;
-    if (!pGuestOSType.isNull())
+    if (pGuestOSType.isNotNull())
     {
         Bstr guestTypeFamilyId;
@@ -686 +686 @@
         fOsXGuest = guestTypeFamilyId == Bstr("MacOS");
         fWinGuest = guestTypeFamilyId == Bstr("Windows");
-        fOs2Guest = osTypeId.startsWith("OS2");
-        fW9xGuest = osTypeId.startsWith("Windows9");    /* Does not include Windows Me. */
-        fDosGuest = osTypeId.startsWith("DOS") || osTypeId.startsWith("Windows31");
+        fOs2Guest = osTypeId.startsWith(GUEST_OS_ID_STR_PARTIAL("OS2"));
+        fW9xGuest = osTypeId.startsWith(GUEST_OS_ID_STR_PARTIAL("Windows9"));    /* Does not include Windows Me. */
+        fDosGuest = osTypeId.equals(GUEST_OS_ID_STR_X86("DOS")) || osTypeId.equals(GUEST_OS_ID_STR_X86("Windows31"));
     }
 
@@ -767 +767 @@
         /* We must limit CPUID count for Windows NT 4, as otherwise it stops
         with error 0x3e (MULTIPROCESSOR_CONFIGURATION_NOT_SUPPORTED). */
-        if (osTypeId == "WindowsNT4")
+        if (osTypeId == GUEST_OS_ID_STR_X86("WindowsNT4"))
         {
             LogRel(("Limiting CPUID leaf count for NT4 guests\n"));
@@ -925 +925 @@
                 but that requires quite a bit of API change in Main. */
             if (    fIOAPIC
-                &&  (   osTypeId == "WindowsNT4"
-                     || osTypeId == "Windows2000"
-                     || osTypeId == "WindowsXP"
-                     || osTypeId == "Windows2003"))
+                &&  (   osTypeId == GUEST_OS_ID_STR_X86("WindowsNT4")
+                     || osTypeId == GUEST_OS_ID_STR_X86("Windows2000")
+                     || osTypeId == GUEST_OS_ID_STR_X86("WindowsXP")
+                     || osTypeId == GUEST_OS_ID_STR_X86("Windows2003")))
             {
                 /* Only allow TPR patching for NT, Win2k, XP and Windows Server 2003. (32 bits mode)
@@ -1008 +1008 @@
 
         /* Enable workaround for missing TLB flush for OS/2 guests, see ticketref:20625. */
-        if (osTypeId.startsWith("OS2"))
+        if (fOs2Guest)
             InsertConfigInteger(pHM, "MissingOS2TlbFlushWorkaround", 1);
 
@@ -1638 +1638 @@
             /** @todo @bugref{7145}: We might want to enable this by default for new VMs. For now,
              *        this is required for Windows 2012 guests. */
-            if (osTypeId == "Windows2012_64")
+            if (osTypeId == GUEST_OS_ID_STR_X64("Windows2012"))
                 InsertConfigInteger(pBiosCfg, "DmiExposeMemoryTable", 1); /* boolean */
         }

trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp

@@ -2878 +2878 @@
          * Determine guest OS type and the required installer image.
          */
+/** @todo r=bird: Why are we using the guest properties for this instead of the
+ * reported guest VBOXOSTYPE/ID?  Since we've got guest properties, we must
+ * have GAs, so the guest additions must've reported the guest OS type. That
+ * would allow proper OS categorization by family ID instead of this ridiculous
+ * naive code assuming anything that isn't windows or solaris must be linux.  */
         Utf8Str strOSType;
         vrc = getGuestProperty(pGuest, "/VirtualBox/GuestInfo/OS/Product", strOSType);
         if (RT_SUCCESS(vrc))
         {
-            if (   strOSType.contains("Microsoft", Utf8Str::CaseInsensitive)
-                || strOSType.contains("Windows", Utf8Str::CaseInsensitive))
+            if (   strOSType.contains(GUEST_OS_ID_STR_PARTIAL("Microsoft"), Utf8Str::CaseInsensitive)
+                || strOSType.contains(GUEST_OS_ID_STR_PARTIAL("Windows"), Utf8Str::CaseInsensitive))
             {
                 osType = eOSType_Windows;
@@ -2927 +2932 @@
                 }
             }
-            else if (strOSType.contains("Solaris", Utf8Str::CaseInsensitive))
+            else if (strOSType.contains(GUEST_OS_ID_STR_PARTIAL("Solaris"), Utf8Str::CaseInsensitive))
             {
                 osType = eOSType_Solaris;