Changeset 16216 in vbox

Timestamp:

Jan 24, 2009 4:30:43 PM (16 years ago)

Author:

vboxsync

Message:

Main: Perform case-insensitive Guest OS type ID comparisons and support old (pre-2.1) type ID values (#3549).

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (2 diffs)
• VirtualBoxImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -902 +902 @@
     CheckComRCReturnRC (rc);
 
+    /* when setting, always use the "etalon" value for consistency -- lookup
+     * by ID is case-insensitive and the input value may have different case */
+    Bstr osTypeId;
+    rc = guestOSType->COMGETTER(Id) (osTypeId.asOutParam());
+    CheckComRCReturnRC (rc);
+
     AutoWriteLock alock (this);
 
@@ -908 +914 @@
 
     mUserData.backup();
-    mUserData->mOSTypeId = aOSTypeId;
+    mUserData->mOSTypeId = osTypeId;
 
     return S_OK;

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -1304 +1304 @@
 STDMETHODIMP VirtualBox::GetGuestOSType (IN_BSTR aId, IGuestOSType **aType)
 {
-    CheckComArgNotNull(aType);
-
-    AutoCaller autoCaller (this);
-    CheckComRCReturnRC (autoCaller.rc());
+    /* Old ID to new ID conversion table. See r39691 for a source */
+    static const wchar_t *kOldNewIDs[] =
+    {
+        L"unknown", L"Other",
+        L"win31", L"Windows31",
+        L"win95", L"Windows95",
+        L"win98", L"Windows98",
+        L"winme", L"WindowsMe",
+        L"winnt4", L"WindowsNT4",
+        L"win2k", L"Windows2000",
+        L"winxp", L"WindowsXP",
+        L"win2k3", L"Windows2003",
+        L"winvista", L"WindowsVista",
+        L"win2k8", L"Windows2008",
+        L"ecs", L"OS2eCS",
+        L"fedoracore", L"Fedora",
+        /* the rest is covered by the case-insensitive comparison */
+    };
+
+    CheckComArgNotNull (aType);
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    /* first, look for a substitution */
+    Bstr id = aId;
+    for (size_t i = 0; i < RT_ELEMENTS (kOldNewIDs) / 2; i += 2)
+    {
+        if (id == kOldNewIDs [i])
+        {
+            id = kOldNewIDs [i + 1];
+            break;
+        }
+    }
 
     *aType = NULL;
@@ -1319 +1349 @@
         const Bstr &typeId = (*it)->id();
         AssertMsg (!!typeId, ("ID must not be NULL"));
-        if (typeId == aId)
+        if (typeId.compareIgnoreCase (id) == 0)
         {
             (*it).queryInterfaceTo (aType);