Changeset 101132 in vbox for trunk/src/VBox/Main

Timestamp:

Sep 15, 2023 4:11:19 PM (15 months ago)

Author:

vboxsync

Message:

Main: Also guard GraphicsControllerType_VMSVGA in platform properties and don't include _Null the returned arrays (FE/Qt does not have translation for those anyway). bugref:10384

File:

• trunk/src/VBox/Main/src-all/PlatformPropertiesImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-all/PlatformPropertiesImpl.cpp

@@ -683 +683 @@
             static const GraphicsControllerType_T aGraphicsControllerTypes[] =
             {
+                GraphicsControllerType_Null,
                 GraphicsControllerType_VBoxVGA,
-                GraphicsControllerType_VMSVGA,
-                GraphicsControllerType_VBoxSVGA,
+                GraphicsControllerType_VBoxSVGA
+#ifdef VBOX_WITH_VMSVGA
+              , GraphicsControllerType_VMSVGA
+#endif
+            };
+            aSupportedGraphicsControllerTypes.assign(aGraphicsControllerTypes + 1 /* Don't include _Null */,
+                                                     aGraphicsControllerTypes + RT_ELEMENTS(aGraphicsControllerTypes));
+            break;
+        }
+
+        case PlatformArchitecture_ARM:
+        {
+            static const GraphicsControllerType_T aGraphicsControllerTypes[] =
+            {
                 GraphicsControllerType_Null
-            };
-            aSupportedGraphicsControllerTypes.assign(aGraphicsControllerTypes,
-                                                     aGraphicsControllerTypes + RT_ELEMENTS(aGraphicsControllerTypes));
-            break;
-        }
-
-        case PlatformArchitecture_ARM:
-        {
-            static const GraphicsControllerType_T aGraphicsControllerTypes[] =
-            {
-                GraphicsControllerType_VMSVGA,
-                GraphicsControllerType_Null
-            };
-            aSupportedGraphicsControllerTypes.assign(aGraphicsControllerTypes,
+#ifdef VBOX_WITH_VMSVGA
+              , GraphicsControllerType_VMSVGA
+#endif
+            };
+            aSupportedGraphicsControllerTypes.assign(aGraphicsControllerTypes /* Don't include _Null */,
                                                      aGraphicsControllerTypes + RT_ELEMENTS(aGraphicsControllerTypes));
             break;
@@ -733 +737 @@
 #endif
             };
-            aSupportedNetworkAdapterTypes.assign(aNetworkAdapterTypes,
+            aSupportedNetworkAdapterTypes.assign(aNetworkAdapterTypes + 1 /* Don't include _Null */,
                                                  aNetworkAdapterTypes + RT_ELEMENTS(aNetworkAdapterTypes));
             break;
@@ -752 +756 @@
 #endif
             };
-            aSupportedNetworkAdapterTypes.assign(aNetworkAdapterTypes,
+            aSupportedNetworkAdapterTypes.assign(aNetworkAdapterTypes + 1 /* Don't include _Null */,
                                                  aNetworkAdapterTypes + RT_ELEMENTS(aNetworkAdapterTypes));
             break;