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

Timestamp:

May 17, 2024 9:15:08 AM (9 months ago)

Author:

vboxsync

Message:

Main: Rebranding changes. bugref:10690

Location:

trunk/src/VBox/Main

Files:

• include/ExtPackManagerImpl.h (modified) (1 diff)
• src-client/ConsoleImplConfigCommon.cpp (modified) (1 diff)
• src-client/ConsoleImplConfigX86.cpp (modified) (1 diff)
• xml/VirtualBox-settings.xsd (modified) (2 diffs)
• xml/samples/VirtualBox-global.xml (modified) (2 diffs)
• xml/samples/VirtualBox-machine-linux.xml (modified) (1 diff)
• xml/samples/VirtualBox-machine-windows.xml (modified) (1 diff)

trunk/src/VBox/Main/include/ExtPackManagerImpl.h

@@ -41 +41 @@
 
 
-/** The name of the oracle extension back. */
+/** The name of the Oracle extension pack. */
 #define ORACLE_PUEL_EXTPACK_NAME VBOX_PUEL_PRODUCT
 

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

@@ -3162 +3162 @@
                  */
 # ifdef VBOX_WITH_EXTPACK
-                if (!mptrExtPackManager->i_isExtPackUsable(s_pszCloudExtPackName))
+                if (   !mptrExtPackManager->i_isExtPackUsable(s_pszCloudExtPackName)
+                    && !mptrExtPackManager->i_isExtPackUsable("Oracle VM VirtualBox Extension Pack")) /* Legacy name -- see @bugref{10690}. */
 # endif
                 {

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

@@ -280 +280 @@
 # ifdef VBOX_WITH_EXTPACK
     static const char *s_pszPCIRawExtPackName = VBOX_PUEL_PRODUCT;
-    if (!mptrExtPackManager->i_isExtPackUsable(s_pszPCIRawExtPackName))
+    if (   !mptrExtPackManager->i_isExtPackUsable(s_pszPCIRawExtPackName)
+        && !mptrExtPackManager->i_isExtPackUsable("Oracle VM VirtualBox Extension Pack")) /* Legacy name -- see @bugref{10690}. */
         /* Always fatal! */
         return pVMM->pfnVMR3SetError(pUVM, VERR_NOT_FOUND, RT_SRC_POS,

trunk/src/VBox/Main/xml/VirtualBox-settings.xsd

@@ -4 +4 @@
  *  :folding=explicit:collapseFolds=1:
  *
- *  Oracle VM VirtualBox Settings Schema
+ *  Oracle VirtualBox Settings Schema
  *  Common definitions
 -->
@@ -39 +39 @@
 <xsd:annotation>
   <xsd:documentation xml:lang="en">
-    Oracle VM VirtualBox Settings Schema (common definitions).
+    Oracle VirtualBox Settings Schema (common definitions).
     Copyright (C) 2004-2023 Oracle and/or its affiliates.
   </xsd:documentation>

trunk/src/VBox/Main/xml/samples/VirtualBox-global.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<!-- Oracle VM VirtualBox Sample Global Configuration -->
+<!-- Oracle VirtualBox Sample Global Configuration -->
 <!--
  *  :tabSize=2:indentSize=2:noTabs=true:
@@ -59 +59 @@
 
 </VirtualBox>
-
-

trunk/src/VBox/Main/xml/samples/VirtualBox-machine-linux.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<!-- Oracle VM VirtualBox Sample Machine Configuration (for a linux host) -->
+<!-- Oracle VirtualBox Sample Machine Configuration (for a linux host) -->
 <!--
  *  :tabSize=2:indentSize=2:noTabs=true:

trunk/src/VBox/Main/xml/samples/VirtualBox-machine-windows.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<!-- Oracle VM VirtualBox Sample Machine Configuration (for a win32 host) -->
+<!-- Oracle VirtualBox Sample Machine Configuration (for a win32 host) -->
 <!--
  *  :tabSize=2:indentSize=2:noTabs=true: