Changeset 44503 in vbox for trunk/src

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

83539

Message:

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

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageList.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/globals/UIMessageCenter.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/medium/UIMediumManager.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic2.cpp (modified) (2 diffs)
• Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic3.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageExpert.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic1.cpp (modified) (2 diffs)
• Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic2.cpp (modified) (1 diff)
• Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageExpert.cpp (modified) (1 diff)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/include/MediumFormatImpl.h (modified) (1 diff)
• Main/src-client/ConsoleImpl2.cpp (modified) (2 diffs)
• Main/src-server/ApplianceImplImport.cpp (modified) (1 diff)
• Main/src-server/MachineImplCloneVM.cpp (modified) (1 diff)
• Main/src-server/MediumFormatImpl.cpp (modified) (1 diff)
• Main/src-server/SnapshotImpl.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;

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

@@ -13412 +13412 @@
   <interface
     name="IMediumFormat" extends="$unknown"
-    uuid="9bd5b655-ea47-4637-99f3-aad0948be35b"
+    uuid="6238e1cf-a17d-4ec1-8172-418bfb22b93a"
     wsmap="managed"
     >
@@ -13460 +13460 @@
     </attribute>
 
-    <attribute name="capabilities" type="unsigned long" readonly="yes">
+    <attribute name="capabilities" type="MediumFormatCapabilities" safearray="yes" readonly="yes">
       <desc>
         Capabilities of the format as a set of bit flags.

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

@@ -91 +91 @@
     STDMETHOD(COMGETTER(Id))(BSTR *aId);
     STDMETHOD(COMGETTER(Name))(BSTR *aName);
-    STDMETHOD(COMGETTER(Capabilities))(ULONG *aCaps);
+    STDMETHOD(COMGETTER(Capabilities))(ComSafeArrayOut(MediumFormatCapabilities_T, aCaps));
 
     // IMediumFormat methods

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

@@ -3244 +3244 @@
             ComPtr<IMediumFormat> pMediumFormat;
             hrc = pMedium->COMGETTER(MediumFormat)(pMediumFormat.asOutParam());             H();
-            ULONG uCaps;
-            hrc = pMediumFormat->COMGETTER(Capabilities)(&uCaps);                           H();
+            ULONG uCaps = 0;
+            com::SafeArray <MediumFormatCapabilities_T> mediumFormatCap;
+            hrc = pMediumFormat->COMGETTER(Capabilities)(ComSafeArrayAsOutParam(mediumFormatCap));    H();
+
+            for (ULONG j = 0; j < mediumFormatCap.size(); j++)
+                uCaps |= mediumFormatCap[j];
+
             if (uCaps & MediumFormatCapabilities_File)
             {
@@ -3418 +3423 @@
             ComPtr<IMediumFormat> pMediumFormat;
             hrc = pMedium->COMGETTER(MediumFormat)(pMediumFormat.asOutParam());             H();
-            ULONG uCaps;
-            hrc = pMediumFormat->COMGETTER(Capabilities)(&uCaps);                           H();
+            ULONG uCaps = 0;
+            com::SafeArray <MediumFormatCapabilities_T> mediumFormatCap;
+            hrc = pMediumFormat->COMGETTER(Capabilities)(ComSafeArrayAsOutParam(mediumFormatCap));     H();
+
+            for (ULONG j = 0; j < mediumFormatCap.size(); j++)
+                uCaps |= mediumFormatCap[j];
+
             if (uCaps & MediumFormatCapabilities_File)
             {

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

@@ -1835 +1835 @@
             /* Check the capabilities. We need create capabilities. */
             ULONG lCabs = 0;
-            rc = trgFormat->COMGETTER(Capabilities)(&lCabs);
+            com::SafeArray <MediumFormatCapabilities_T> mediumFormatCap;
+            rc = trgFormat->COMGETTER(Capabilities)(ComSafeArrayAsOutParam(mediumFormatCap));
+
             if (FAILED(rc)) throw rc;
+            else
+            {
+                for (ULONG j = 0; j < mediumFormatCap.size(); j++)
+                    lCabs |= mediumFormatCap[j];
+            }
+
             if (!(   ((lCabs & MediumFormatCapabilities_CreateFixed) == MediumFormatCapabilities_CreateFixed)
                   || ((lCabs & MediumFormatCapabilities_CreateDynamic) == MediumFormatCapabilities_CreateDynamic)))

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

@@ -1090 +1090 @@
                         rc = pMedium->COMGETTER(MediumFormat)(pSrcFormat.asOutParam());
                         ULONG uSrcCaps = 0;
-                        rc = pSrcFormat->COMGETTER(Capabilities)(&uSrcCaps);
+                        com::SafeArray <MediumFormatCapabilities_T> mediumFormatCap;
+                        rc = pSrcFormat->COMGETTER(Capabilities)(ComSafeArrayAsOutParam(mediumFormatCap));
+
                         if (FAILED(rc)) throw rc;
+                        else
+                        {
+                            for (ULONG j = 0; j < mediumFormatCap.size(); j++)
+                                uSrcCaps |= mediumFormatCap[j];
+                        }
 
                         /* Default format? */

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

@@ -218 +218 @@
 }
 
-STDMETHODIMP MediumFormat::COMGETTER(Capabilities)(ULONG *aCaps)
-{
-    CheckComArgOutPointerValid(aCaps);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    /* m.capabilities is const, no need to lock */
-
-    /// @todo add COMGETTER(ExtendedCapabilities) when we reach the 32 bit
-    /// limit (or make the argument ULONG64 after checking that COM is capable
-    /// of defining enums (used to represent bit flags) that contain 64-bit
-    /// values). Or go away from the enum/ulong hack for bit sets and use
-    /// a safearray like elsewhere.
-    ComAssertRet((uint64_t)m.capabilities == ((ULONG)m.capabilities), E_FAIL);
-
-    *aCaps = (ULONG)m.capabilities;
+STDMETHODIMP MediumFormat::COMGETTER(Capabilities)(ComSafeArrayOut(MediumFormatCapabilities_T, aCaps))
+{
+    CheckComArgOutSafeArrayPointerValid(aCaps);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    SafeArray<MediumFormatCapabilities_T> capabilities(sizeof(MediumFormatCapabilities_T)*8);
+
+    for (ULONG i = 0; i < capabilities.size(); ++i)
+    {
+        ULONG temp = m.capabilities;
+        temp &= 1<<i;
+        capabilities [i] = (MediumFormatCapabilities_T)temp;
+    }
+
+    capabilities.detachTo(ComSafeArrayOutArg(aCaps));
 
     return S_OK;

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

@@ -2536 +2536 @@
                     throw rc;
                 ULONG uTargetCaps = 0;
-                rc = pTargetFormat->COMGETTER(Capabilities)(&uTargetCaps);
-                if (FAILED(rc))
-                    throw rc;
+                com::SafeArray <MediumFormatCapabilities_T> mediumFormatCap;
+                rc = pTargetFormat->COMGETTER(Capabilities)(ComSafeArrayAsOutParam(mediumFormatCap));
+
+                if (FAILED(rc)) throw rc;
+                else
+                {
+                    for (ULONG j = 0; j < mediumFormatCap.size(); j++)
+                        uTargetCaps |= mediumFormatCap[j];
+                }
 
                 if (uTargetCaps & MediumFormatCapabilities_File)