Changeset 23223 in vbox for trunk/include

Timestamp:

Sep 22, 2009 3:50:03 PM (15 years ago)

Author:

vboxsync

Message:

API: big medium handling change and lots of assorted other cleanups and fixes

Location:

trunk/include

Files:

• VBox/com/VirtualBoxErrorInfo.h (modified) (5 diffs)
• VBox/com/defs.h (modified) (3 diffs)
• VBox/com/ptr.h (modified) (1 diff)
• VBox/settings.h (modified) (5 diffs)
• iprt/ministring_cpp.h (modified) (1 diff)

trunk/include/VBox/com/VirtualBoxErrorInfo.h

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2008 Sun Microsystems, Inc.
+ * Copyright (C) 2008-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -56 +56 @@
  */
 class ATL_NO_VTABLE VirtualBoxErrorInfo
-#if !defined (VBOX_WITH_XPCOM)
     : public CComObjectRootEx <CComMultiThreadModel>
-#else
-    : public CComObjectRootEx
-#endif
     , public IVirtualBoxErrorInfo
 {
@@ -73 +69 @@
         COM_INTERFACE_ENTRY (IVirtualBoxErrorInfo)
     END_COM_MAP()
-
-    NS_DECL_ISUPPORTS
 
     VirtualBoxErrorInfo() : mResultCode (S_OK) {}
@@ -127 +121 @@
  */
 class ATL_NO_VTABLE VirtualBoxErrorInfoGlue
-#if !defined (VBOX_WITH_XPCOM)
     : public CComObjectRootEx <CComMultiThreadModel>
-#else
-    : public CComObjectRootEx
-#endif
     , public IVirtualBoxErrorInfo
 {
@@ -144 +134 @@
         COM_INTERFACE_ENTRY (IVirtualBoxErrorInfo)
     END_COM_MAP()
-
-    NS_DECL_ISUPPORTS
 
     VirtualBoxErrorInfoGlue() {}

trunk/include/VBox/com/defs.h

@@ -84 +84 @@
 /* these are XPCOM only, one for every interface implemented */
 #define NS_DECL_ISUPPORTS
-#define NS_DECL_IVIRTUALBOX
-#define NS_DECL_IMACHINECOLLECTION
-#define NS_DECL_IMACHINE
 
 /** Returns @c true if @a rc represents a warning result code */
@@ -245 +242 @@
 #define DECLARE_REGISTRY_RESOURCEID(a)
 #define DECLARE_NOT_AGGREGATABLE(a)
-#define DECLARE_PROTECT_FINAL_CONSTRUCT(a)
+#define DECLARE_PROTECT_FINAL_CONSTRUCT()
 #define BEGIN_COM_MAP(a)
 #define COM_INTERFACE_ENTRY(a)
 #define COM_INTERFACE_ENTRY2(a,b)
-#define END_COM_MAP(a)
+#define END_COM_MAP() NS_DECL_ISUPPORTS
 
 #define HRESULT     nsresult
@@ -339 +336 @@
 #define COM_IIDOF(I) NS_GET_IID (I)
 
-/* Two very simple ATL emulator classes to provide
+/* A few very simple ATL emulator classes to provide
  * FinalConstruct()/FinalRelease() functionality on Linux. */
 
-class CComObjectRootEx
+class CComMultiThreadModel
+{
+};
+
+template <class Base> class CComObjectRootEx : public Base
 {
 public:

trunk/include/VBox/com/ptr.h

@@ -84 +84 @@
     static void addref(C *p)
     {
-        int cRefs = p->AddRef();
-        LOGREF("ADDREF ", p, cRefs);
+        p->AddRef();
     }
     static void release(C *p)
     {
-        int cRefs = p->Release();
-        LOGREF("RELEASE", p, cRefs);
+        p->Release();
     }
 };

trunk/include/VBox/settings.h

@@ -175 +175 @@
     bool            fAutoReset;         // optional, only for diffs, default is false
     PropertiesMap   properties;
-    HardDiskType_T  hdType;
+    MediumType_T    hdType;
 
     MediaList       llChildren;         // only used with hard disks
@@ -274 +274 @@
 };
 
-struct DVDDrive
-{
-    DVDDrive()
-        : fPassThrough(false)
-    {}
-
-    bool            fPassThrough;
-    com::Guid       uuid;               // if != NULL, UUID of mounted ISO image
-    com::Utf8Str    strHostDriveSrc;    // if != NULL, value of <HostDrive>/@src
-};
-
-struct FloppyDrive
-{
-    FloppyDrive()
-        : fEnabled(true)
-    {}
-
-    bool            fEnabled;           // optional, defaults to true
-    com::Guid       uuid;               // if != NULL, UUID of mounted ISO image
-    com::Utf8Str    strHostDriveSrc;    // if != NULL, value of <HostDrive>/@src
-};
-
 struct USBController
 {
@@ -435 +413 @@
     bool                fAccelerate3D,
                         fAccelerate2DVideo;     // requires settings version 1.8 (VirtualBox 3.1)
-    uint32_t            cFirmwareType;          // ditto
+    FirmwareType_T      firmwareType;           // requires settings version 1.9 (VirtualBox 3.1)
 
     VRDPSettings        vrdpSettings;
 
     BIOSSettings        biosSettings;
-    DVDDrive            dvdDrive;
-    FloppyDrive         floppyDrive;
     USBController       usbController;
     NetworkAdaptersList llNetworkAdapters;
@@ -460 +436 @@
 };
 
+/**
+ * A device attached to a storage controller. This can either be a
+ * hard disk or a DVD drive or a floppy drive and also specifies
+ * which medium is "in" the drive; as a result, this is a combination
+ * of the Main IMedium and IMediumAttachment interfaces.
+ */
 struct AttachedDevice
 {
     AttachedDevice()
-        : type(HardDisk),
+        : deviceType(DeviceType_Null),
+          fPassThrough(false),
           lPort(0),
           lDevice(0)
     {}
 
-    enum { HardDisk }   type;           // @todo: implement DVD attachments here
+    DeviceType_T        deviceType;         // only HardDisk, DVD or Floppy are allowed
+
+    // DVDs can be in pass-through mode:
+    bool                fPassThrough;
+
     int32_t             lPort;
     int32_t             lDevice;
+
+    // if an image file is attached to the device (ISO, RAW, or hard disk image such as VDI),
+    // this is its UUID; it depends on deviceType which media registry this then needs to
+    // be looked up in. If no image file (only permitted for DVDs and floppies), then the UUID is NULL
     com::Guid           uuid;
+
+    // for DVDs and floppies, the attachment can also be a host device:
+    com::Utf8Str        strHostDriveSrc;        // if != NULL, value of <HostDrive>/@src
 };
 typedef std::list<AttachedDevice> AttachedDevicesList;
@@ -541 +535 @@
     void readHardDiskAttachments_pre1_7(const xml::ElementNode &elmHardDiskAttachments, Storage &strg);
     void readStorageControllers(const xml::ElementNode &elmStorageControllers, Storage &strg);
+    void readDVDAndFloppies_pre1_9(const xml::ElementNode &elmHardware, Storage &strg);
     void readSnapshot(const xml::ElementNode &elmSnapshot, Snapshot &snap);
     void readMachine(const xml::ElementNode &elmMachine);
 
-    void writeHardware(xml::ElementNode &elmParent, const Hardware &hw);
+    void writeHardware(xml::ElementNode &elmParent, const Hardware &hw, const Storage &strg);
     void writeStorageControllers(xml::ElementNode &elmParent, const Storage &st);
     void writeSnapshot(xml::ElementNode &elmParent, const Snapshot &snap);

trunk/include/iprt/ministring_cpp.h

@@ -212 +212 @@
     }
 
-    /**
-     * Appends a copy of @a that to "this".
-     * @param that
-     */
-    MiniString& append(const MiniString &that)
-    {
-        size_t cbThis = length();
-        size_t cbThat = that.length();
-
-        if (cbThat)
-        {
-            size_t cbBoth = cbThis + cbThat + 1;
-
-            reserve(cbBoth);
-                // calls realloc(cbBoth) and sets m_cbAllocated
-
-            memcpy(m_psz + cbThis, that.m_psz, cbThat);
-            m_psz[cbThis + cbThat] = '\0';
-            m_cbLength = cbBoth - 1;
-        }
-        return *this;
-    }
+    MiniString& append(const MiniString &that);
+    MiniString& append(char c);
 
     /**