Changeset 93561 in vbox for trunk/src/VBox

Timestamp:

Feb 3, 2022 7:02:29 AM (3 years ago)

Author:

vboxsync

Message:

Work around inability of XPCOM to handle enums starting with a digit.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageInfo.cpp (modified) (1 diff)
• Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (1 diff)
• Main/src-client/ConsoleImpl.cpp (modified) (1 diff)
• Main/src-client/ConsoleImpl2.cpp (modified) (2 diffs)
• Main/src-server/NetworkAdapterImpl.cpp (modified) (1 diff)
• Main/xml/Settings.cpp (modified) (2 diffs)

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

@@ -1818 +1818 @@
                     case NetworkAdapterType_WD8003:     pszNICType = "WD8003";      break;
                     case NetworkAdapterType_WD8013:     pszNICType = "WD8013";      break;
-                    case NetworkAdapterType_3C503:      pszNICType = "3C503";       break;
-                    case NetworkAdapterType_3C501:      pszNICType = "3C501";       break;
+                    case NetworkAdapterType_ELNK2:      pszNICType = "3C503";       break;
+                    case NetworkAdapterType_ELNK1:      pszNICType = "3C501";       break;
                     default:
                         AssertFailed();

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

@@ -1572 +1572 @@
                 else if (!RTStrICmp(ValueUnion.psz, "3C503"))
                 {
-                    CHECK_ERROR(nic, COMSETTER(AdapterType)(NetworkAdapterType_3C503));
+                    CHECK_ERROR(nic, COMSETTER(AdapterType)(NetworkAdapterType_ELNK2));
                 }
                 else if (!RTStrICmp(ValueUnion.psz, "3C501"))
                 {
-                    CHECK_ERROR(nic, COMSETTER(AdapterType)(NetworkAdapterType_3C501));
+                    CHECK_ERROR(nic, COMSETTER(AdapterType)(NetworkAdapterType_ELNK1));
                 }
                 else

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -20570 +20570 @@
         <desc>WD/SMC EtherCard Plus network card (WD8003E).</desc>
     </const>
-    <const name="3C503"                 value="12">
+    <const name="ELNK2"                value="12">
         <desc>3Com EtherLink II network card (3C503).</desc>
     </const>
-    <const name="3C501"                 value="13">
+    <const name="ELNK1"                 value="13">
         <desc>3Com EtherLink network card (3C501/3C500).</desc>
     </const>

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

@@ -1571 +1571 @@
         case NetworkAdapterType_WD8003:
         case NetworkAdapterType_WD8013:
-        case NetworkAdapterType_3C503:
+        case NetworkAdapterType_ELNK2:
             return "dp8390";
-        case NetworkAdapterType_3C501:
+        case NetworkAdapterType_ELNK1:
             return "3c501";
         default:

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

@@ -2676 +2676 @@
                 case NetworkAdapterType_WD8003:
                 case NetworkAdapterType_WD8013:
-                case NetworkAdapterType_3C503:
+                case NetworkAdapterType_ELNK2:
                     pDev = pDevDP8390;
                     break;
-                case NetworkAdapterType_3C501:
+                case NetworkAdapterType_ELNK1:
                     pDev = pDev3C501;
                     break;
@@ -2781 +2781 @@
                     InsertConfigString(pCfg, "DeviceType", "WD8013");
                     break;
-                case NetworkAdapterType_3C503:
+                case NetworkAdapterType_ELNK2:
                     InsertConfigString(pCfg, "DeviceType", "3C503");
                     break;
-                case NetworkAdapterType_3C501:
+                case NetworkAdapterType_ELNK1:
                     break;
                 case NetworkAdapterType_Null:      AssertFailedBreak(); /* (compiler warnings) */

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

@@ -250 +250 @@
         case NetworkAdapterType_WD8003:
         case NetworkAdapterType_WD8013:
-        case NetworkAdapterType_3C503:
-        case NetworkAdapterType_3C501:
+        case NetworkAdapterType_ELNK2:
+        case NetworkAdapterType_ELNK1:
             break;
         default:

trunk/src/VBox/Main/xml/Settings.cpp

@@ -4122 +4122 @@
                 nic.type = NetworkAdapterType_WD8013;
             else if (strTemp == "3C503")
-                nic.type = NetworkAdapterType_3C503;
+                nic.type = NetworkAdapterType_ELNK2;
             else if (strTemp == "3C501")
-                nic.type = NetworkAdapterType_3C501;
+                nic.type = NetworkAdapterType_ELNK1;
             else
                 throw ConfigFileError(this, pelmAdapter, N_("Invalid value '%s' in Adapter/@type attribute"), strTemp.c_str());
@@ -6855 +6855 @@
                         case NetworkAdapterType_WD8003:     pcszType = "WD8003"; break;
                         case NetworkAdapterType_WD8013:     pcszType = "WD8013"; break;
-                        case NetworkAdapterType_3C503:      pcszType = "3C503"; break;
-                        case NetworkAdapterType_3C501:      pcszType = "3C501"; break;
+                        case NetworkAdapterType_ELNK2:      pcszType = "3C503"; break;
+                        case NetworkAdapterType_ELNK1:      pcszType = "3C501"; break;
                         default: /*case NetworkAdapterType_Am79C970A:*/  pcszType = "Am79C970A"; break;
                     }