Changeset 33474 in vbox for trunk

Timestamp:

Oct 26, 2010 4:44:17 PM (14 years ago)

Author:

vboxsync

Message:

ExtPack: Sketches and some code.

Location:

trunk/src/VBox/Main

Files:

• ExtPackManagerImpl.cpp (added)
• Makefile.kmk (modified) (4 diffs)
• idl/VirtualBox.xidl (modified) (1 diff)
• include/ExtPackManagerImpl.h (added)
• xpcom/server.cpp (modified) (2 diffs)

trunk/src/VBox/Main/Makefile.kmk

@@ -228 +228 @@
         $(if $(VBOX_USB_WITH_INOTIFY),VBOX_USB_WITH_INOTIFY,) \
         $(if $(VBOX_WITH_LIVE_MIGRATION),VBOX_WITH_LIVE_MIGRATION,) \
+        $(if $(VBOX_WITH_EXTPACK),VBOX_WITH_EXTPACK,) \
         $(if $(VBOX_WITH_VUSB),VBOX_WITH_VUSB,)
 ifdef VBOX_WITH_USB
  VBoxSVC_DEFS += \
-VBOX_WITH_USB \
+        VBOX_WITH_USB \
         $(if $(VBOX_WITH_EHCI),VBOX_WITH_EHCI,) \
         $(if $(VBOX_WITH_NEW_USB_CODE_ON_DARWIN),VBOX_WITH_NEW_USB_CODE_ON_DARWIN,)
@@ -320 +321 @@
         $(if $(VBOX_WITH_VRDP),VRDPServerImpl.cpp,) \
         $(if $(VBOX_WITH_XPCOM),xpcom/server.cpp,) \
-        $(VBOX_XML_SCHEMADEFS_CPP)
+        $(VBOX_XML_SCHEMADEFS_CPP) \
+        $(if $(VBOX_WITH_EXTPACK),ExtPackManagerImpl.cpp,)
 
 $(VBOX_AUTOGEN_EVENT_CPP): $(VBOX_PATH_MAIN_SRC)/idl/comimpl.xsl $(VBOX_XIDL_FILE) | $$(dir $$@)
@@ -564 +566 @@
         $(if $(VBOX_WITH_PDM_ASYNC_COMPLETION),VBOX_WITH_PDM_ASYNC_COMPLETION,) \
         $(if $(VBOX_WITH_LIVE_MIGRATION),VBOX_WITH_LIVE_MIGRATION,) \
-        $(if $(VBOX_WITH_VUSB),VBOX_WITH_VUSB,)
-ifdef VBOX_WITH_USB
-VBoxC_DEFS += \
-        VBOX_WITH_USB \
-        $(if $(VBOX_WITH_EHCI),VBOX_WITH_EHCI,)
-endif
-ifdef VBOX_WITH_OLD_VBVA_LOCK
-VBoxC_DEFS += VBOX_WITH_OLD_VBVA_LOCK
-endif
-ifdef VBOX_WITH_HGSMI
-VBoxC_DEFS += VBOX_WITH_HGSMI
-endif
-ifdef VBOX_WITH_VIDEOHWACCEL
-VBoxC_DEFS += VBOX_WITH_VIDEOHWACCEL
-endif
+        $(if $(VBOX_WITH_VUSB),VBOX_WITH_VUSB,) \
+        $(if $(VBOX_WITH_OLD_VBVA_LOCK),VBOX_WITH_OLD_VBVA_LOCK,) \
+        $(if $(VBOX_WITH_HGSMI),VBOX_WITH_HGSMI,) \
+        $(if $(VBOX_WITH_VIDEOHWACCEL),VBOX_WITH_VIDEOHWACCEL,) \
+        $(if $(VBOX_WITH_USB),VBOX_WITH_USB,) \
+        $(if-expr defined(VBOX_WITH_EHCI) && defined(VBOX_WITH_USB),VBOX_WITH_EHCI,) \
+        $(if $(VBOX_WITH_EXTPACK),VBOX_WITH_EXTPACK,)
 
 VBoxC_DEFS.darwin.x86 = VBOX_WITH_2X_4GB_ADDR_SPACE
@@ -645 +639 @@
         EventImpl.cpp \
         $(VBOX_AUTOGEN_EVENT_CPP) \
-        $(VBOX_XML_SCHEMADEFS_CPP)
+        $(VBOX_XML_SCHEMADEFS_CPP) \
+        $(if $(VBOX_WITH_EXTPACK),ExtPackManagerImpl.cpp,)
 VBoxC_SOURCES.win = \
         win/dllmain.cpp \

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

@@ -13953 +13953 @@
   </interface>
 
+  <!--
+  // IExtPackManager
+  /////////////////////////////////////////////////////////////////////////
+  -->
+
+  <interface
+    name="IExtPack" extends="$unknown"
+    uuid="1b69431b-b22f-454a-977d-7d50986defcb"
+    wsmap="suppress"
+    >
+    <desc>
+      Interface for querying interfaces and information relating to an
+      extension pack.  The extension pack specific interfaces can be queried
+      via the IUnknown::QueryInterface method.
+    </desc>
+    <attribute name="name" type="wstring" readonly="yes">
+      <desc>The extension pack name.  This is unique.</desc>
+    </attribute>
+    <attribute name="version" type="wstring" readonly="yes">
+      <desc>
+        The extension pack version string.  This is on the same form as
+        other VirtualBox version strings, i.e.: "1.2.3", "1.2.3_BETA1",
+        "1.2.3-OSE", "1.2.3r45678", "1.2.3r45678-OSE", "1.2.3_BETA1-r45678"
+        or "1.2.3_BETA1-r45678-OSE"
+      </desc>
+    </attribute>
+    <attribute name="revision" type="unsigned long" readonly="yes">
+      <desc>The extension pack internal revision number.</desc>
+    </attribute>
+    <attribute name="usable" type="boolean" readonly="yes">
+      <desc>
+        Indicates whether the extension pack is usable or not.  An
+        extension pack that is not compatible with the current VirtualBox
+        version will be flagged as not usable.
+      </desc>
+    </attribute>
+    <attribute name="whyUnusable" type="wstring" readonly="yes">
+      <desc>
+        String indicating why the extension pack is not usable.  This is an
+        empty string if usable and always a non-empty string if not usable.
+      </desc>
+    </attribute>
+  </interface>
+
+  <interface
+    name="IExtPackManager" extends="$unknown"
+    uuid="ba1fbfca-53f1-471c-b5a1-416386f0f52b"
+    wsmap="suppress"
+    >
+    <desc>
+      Interface for managing VirtualBox Extension Packs.
+
+      TODO: Describe extension packs, how they are managed and how to create
+            one.
+    </desc>
+
+    <attribute name="installedExtPacks" type="IExtPack" safearray="yes" readonly="yes">
+      <desc>
+        List of the installed extension packs.
+      </desc>
+    </attribute>
+
+    <method name="find">
+      <desc>
+        Returns the extension pack with the specified name if found.
+
+        <result name="VBOX_E_OBJECT_NOT_FOUND">
+          No extension pack matching @a name was found.
+        </result>
+      </desc>
+      <param name="name" type="wstring" dir="in">
+        <desc>The name of the extension pack to locate.</desc>
+      </param>
+      <param name="returnData" type="IExtPack" dir="return">
+        <desc>The extension pack if found.</desc>
+      </param>
+    </method>
+
+    <method name="install">
+      <param name="path" type="wstring" dir="in">
+        <desc>The path of the extension pack tarball.</desc>
+      </param>
+      <param name="name" type="wstring" dir="out">
+        <desc>The name of the installed extension pack.</desc>
+      </param>
+    </method>
+
+    <method name="uninstall">
+      <desc>Uninstalls an extension pack, removing all related files.</desc>
+      <param name="name" type="wstring" dir="in">
+        <desc>The name of the extension pack to uninstall.</desc>
+      </param>
+      <param name="forcedRemoval" type="boolean" dir="in">
+        <desc>
+          Forced removal of the extension pack.  This means that the uninstall
+          hook will not be called.
+        </desc>
+      </param>
+    </method>
+  </interface>
+
+  <!--
+  // Events
+  /////////////////////////////////////////////////////////////////////////
+  -->
   <enum
      name="VBoxEventType"

trunk/src/VBox/Main/xpcom/server.cpp

@@ -92 +92 @@
 #include <AudioAdapterImpl.h>
 #include <SystemPropertiesImpl.h>
+#ifdef VBOX_WITH_EXTPACK
+# include <ExtPackManagerImpl.h>
+#endif
 
 /* implement nsISupports parts of our objects with support for nsIClassInfo */
@@ -202 +205 @@
 NS_DECL_CLASSINFO(BIOSSettings)
 NS_IMPL_THREADSAFE_ISUPPORTS1_CI(BIOSSettings, IBIOSSettings)
+
+#ifdef VBOX_WITH_EXTPACK
+NS_DECL_CLASSINFO(ExtPack)
+NS_IMPL_THREADSAFE_ISUPPORTS1_CI(ExtPack, IExtPack)
+
+NS_DECL_CLASSINFO(ExtPackManager)
+NS_IMPL_THREADSAFE_ISUPPORTS1_CI(ExtPackManager, IExtPackManager)
+#endif
 
 ////////////////////////////////////////////////////////////////////////////////