Changeset 44503 in vbox for trunk/src/VBox/Frontends

Timestamp:

Feb 1, 2013 6:28:53 AM (12 years ago)

Author:

vboxsync

Message:

Main: change API. Interface IMediumFormat was touched. Attribute capabilities got the type MediumFormatCapabilities and option safeArray. PR5434.

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManageList.cpp (modified) (1 diff)
• VirtualBox/src/globals/UIMessageCenter.cpp (modified) (1 diff)
• VirtualBox/src/medium/UIMediumManager.cpp (modified) (1 diff)
• VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic2.cpp (modified) (2 diffs)
• VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic3.cpp (modified) (1 diff)
• VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageExpert.cpp (modified) (1 diff)
• VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic1.cpp (modified) (2 diffs)
• VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic2.cpp (modified) (1 diff)
• VirtualBox/src/wizards/newvd/UIWizardNewVDPageExpert.cpp (modified) (1 diff)

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

@@ -271 +271 @@
                     COMGETTER(Id)(description.asOutParam()));
 
-        ULONG caps;
+        ULONG caps = 0;
+        com::SafeArray <MediumFormatCapabilities_T> mediumFormatCap;
         CHECK_ERROR(mediumFormats[i],
-                    COMGETTER(Capabilities)(&caps));
+                    COMGETTER(Capabilities)(ComSafeArrayAsOutParam(mediumFormatCap)));
+        for (ULONG j = 0; j < mediumFormatCap.size(); j++)
+            caps |= mediumFormatCap[j];
+
 
         RTPrintf("Backend %u: id='%ls' description='%ls' capabilities=%#06x extensions='",

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -1459 +1459 @@
             .arg(aMedium.location());
 
+    qulonglong caps = 0;
+    QVector<KMediumFormatCapabilities> capabilities;
+    capabilities = aMedium.medium().GetMediumFormat().GetCapabilities();
+    for (int i = 0; i < capabilities.size(); i++)
+        caps |= capabilities[i];
+
     if (aMedium.type() == UIMediumType_HardDisk &&
-        aMedium.medium().GetMediumFormat().GetCapabilities() & MediumFormatCapabilities_File)
+        caps & MediumFormatCapabilities_File)
     {
         if (aMedium.state() == KMediumState_Inaccessible)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

@@ -1142 +1142 @@
              * will give a corresponding hint. Therefore, once the code is
              * changed below, the hint should be re-checked for validity. */
+
+            qulonglong caps = 0;
+            QVector<KMediumFormatCapabilities> capabilities;
+            capabilities = item->medium().medium().GetMediumFormat().GetCapabilities();
+            for (int i = 0; i < capabilities.size(); i++)
+                caps |= capabilities[i];
+
             if (item->state() != KMediumState_Inaccessible &&
-                item->medium().medium().GetMediumFormat().GetCapabilities() & MediumFormatCapabilities_File)
+                caps & MediumFormatCapabilities_File)
             {
                 int rc = msgCenter().

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic2.cpp

@@ -39 +39 @@
 {
     /* Check that medium format supports creation: */
-    ULONG uFormatCapabilities = medFormat.GetCapabilities();
+    //ULONG uFormatCapabilities = medFormat.GetCapabilities();
+    ULONG uFormatCapabilities = 0;
+    QVector<KMediumFormatCapabilities> capabilities;
+    capabilities = medFormat.GetCapabilities();
+    for (ULONG i = 0; i < capabilities.size(); i++)
+        uFormatCapabilities |= capabilities[i];
+
     if (!(uFormatCapabilities & MediumFormatCapabilities_CreateFixed ||
           uFormatCapabilities & MediumFormatCapabilities_CreateDynamic))
@@ -149 +155 @@
     /* Show variant page only if there is something to show: */
     CMediumFormat medFormat = mediumFormat();
-    ULONG uCapabilities = medFormat.GetCapabilities();
+//    ULONG uCapabilities = medFormat.GetCapabilities();
+    ULONG uCapabilities = 0;
+    QVector<KMediumFormatCapabilities> capabilities;
+    capabilities = medFormat.GetCapabilities();
+    for (ULONG i = 0; i < capabilities.size(); i++)
+        uCapabilities |= capabilities[i];
+
     int cTest = 0;
     if (uCapabilities & KMediumFormatCapabilities_CreateDynamic)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic3.cpp

@@ -145 +145 @@
     /* Setup visibility: */
     CMediumFormat mediumFormat = field("mediumFormat").value<CMediumFormat>();
-    ULONG uCapabilities = mediumFormat.GetCapabilities();
+    ULONG uCapabilities = 0;
+    QVector<KMediumFormatCapabilities> capabilities;
+    capabilities = mediumFormat.GetCapabilities();
+    for (ULONG i = 0; i < capabilities.size(); i++)
+        uCapabilities |= capabilities[i];
+
     bool fIsCreateDynamicPossible = uCapabilities & KMediumFormatCapabilities_CreateDynamic;
     bool fIsCreateFixedPossible = uCapabilities & KMediumFormatCapabilities_CreateFixed;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageExpert.cpp

@@ -187 +187 @@
 
     /* Enable/disable widgets: */
-    ULONG uCapabilities = mf.GetCapabilities();
+    ULONG uCapabilities = 0;
+    QVector<KMediumFormatCapabilities> capabilities;
+    capabilities = mf.GetCapabilities();
+    for (ULONG i = 0; i < capabilities.size(); i++)
+        uCapabilities |= capabilities[i];
+
     bool fIsCreateDynamicPossible = uCapabilities & KMediumFormatCapabilities_CreateDynamic;
     bool fIsCreateFixedPossible = uCapabilities & KMediumFormatCapabilities_CreateFixed;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic1.cpp

@@ -39 +39 @@
 {
     /* Check that medium format supports creation: */
-    ULONG uFormatCapabilities = medFormat.GetCapabilities();
+    ULONG uFormatCapabilities = 0;
+    QVector<KMediumFormatCapabilities> capabilities;
+    capabilities = medFormat.GetCapabilities();
+    for (ULONG i = 0; i < capabilities.size(); i++)
+        uFormatCapabilities |= capabilities[i];
+
     if (!(uFormatCapabilities & MediumFormatCapabilities_CreateFixed ||
           uFormatCapabilities & MediumFormatCapabilities_CreateDynamic))
@@ -149 +154 @@
     /* Show variant page only if there is something to show: */
     CMediumFormat mf = mediumFormat();
-    ULONG uCapabilities = mf.GetCapabilities();
+    ULONG uCapabilities = 0;
+    QVector<KMediumFormatCapabilities> capabilities;
+    capabilities = mf.GetCapabilities();
+    for (ULONG i = 0; i < capabilities.size(); i++)
+        uCapabilities |= capabilities[i];
+
     int cTest = 0;
     if (uCapabilities & KMediumFormatCapabilities_CreateDynamic)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic2.cpp

@@ -145 +145 @@
     /* Setup visibility: */
     CMediumFormat mediumFormat = field("mediumFormat").value<CMediumFormat>();
-    ULONG uCapabilities = mediumFormat.GetCapabilities();
+    ULONG uCapabilities = 0;
+    QVector<KMediumFormatCapabilities> capabilities;
+    capabilities = mediumFormat.GetCapabilities();
+    for (ULONG i = 0; i < capabilities.size(); i++)
+        uCapabilities |= capabilities[i];
+
     bool fIsCreateDynamicPossible = uCapabilities & KMediumFormatCapabilities_CreateDynamic;
     bool fIsCreateFixedPossible = uCapabilities & KMediumFormatCapabilities_CreateFixed;

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageExpert.cpp

@@ -189 +189 @@
 
     /* Enable/disable widgets: */
-    ULONG uCapabilities = mf.GetCapabilities();
+    ULONG uCapabilities = 0;
+    QVector<KMediumFormatCapabilities> capabilities;
+    capabilities = mf.GetCapabilities();
+    for (ULONG i = 0; i < capabilities.size(); i++)
+        uCapabilities |= capabilities[i];
+
     bool fIsCreateDynamicPossible = uCapabilities & KMediumFormatCapabilities_CreateDynamic;
     bool fIsCreateFixedPossible = uCapabilities & KMediumFormatCapabilities_CreateFixed;