Changeset 34244 in vbox for trunk/include/VBox

Timestamp:

Nov 22, 2010 2:31:02 PM (14 years ago)

Author:

vboxsync

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

67992

Message:

Main,Config.kmk,VBoxManage,ExtPacks: Moved the VRDE bits from IVirtualBox to the extension packs; changed ISystemProperties and IVRDEServer to talk about VRDE extension packs instead of VRDE libraries.

Location:

trunk/include/VBox

Files:

• ExtPack/ExtPack.h (modified) (4 diffs)
• settings.h (modified) (5 diffs)

trunk/include/VBox/ExtPack/ExtPack.h

@@ -42 +42 @@
 VBOXEXTPACK_IF_CS(IMachine);
 VBOXEXTPACK_IF_CS(IVirtualBox);
+
+/**
+ * Module kind for use with VBOXEXTPACKHLP::pfnFindModule.
+ */
+typedef enum VBOXEXTPACKMODKIND
+{
+    /** Zero is invalid as alwasy. */
+    VBOXEXTPACKMODKIND_INVALID = 0,
+    /** Raw-mode context module. */
+    VBOXEXTPACKMODKIND_RC,
+    /** Ring-0 context module. */
+    VBOXEXTPACKMODKIND_R0,
+    /** Ring-3 context module. */
+    VBOXEXTPACKMODKIND_R3,
+    /** End of the valid values (exclusive). */
+    VBOXEXTPACKMODKIND_END,
+    /** The usual 32-bit type hack. */
+    VBOXEXTPACKMODKIND_32BIT_HACK = 0x7fffffff
+} VBOXEXTPACKMODKIND;
 
 
@@ -74 +93 @@
      * @param   pszExt          The extension. If NULL the default ring-3
      *                          library extension will be used.
+     * @param   enmKind         The kind of module to locate.
      * @param   pszFound        Where to return the path to the module on
      *                          success.
@@ -80 +100 @@
      */
     DECLR3CALLBACKMEMBER(int, pfnFindModule,(PCVBOXEXTPACKHLP pHlp, const char *pszName, const char *pszExt,
+                                             VBOXEXTPACKMODKIND enmKind,
                                              char *pszFound, size_t cbFound, bool *pfNative));
 
@@ -97 +118 @@
      */
     DECLR3CALLBACKMEMBER(int, pfnGetFilePath,(PCVBOXEXTPACKHLP pHlp, const char *pszFilename, char *pszPath, size_t cbPath));
-
-    /**
-     * Registers a VRDE library (IVirtualBox::VRDERegisterLibrary wrapper).
-     *
-     * @returns VBox status code.
-     * @param   pHlp            Pointer to this helper structure.
-     * @param   pszName         The module base name.  This will be found using
-     *                          the pfnFindModule algorithm.
-     * @param   fSetDefault     Whether to make it default if no other default
-     *                          is set.
-     *
-     * @remarks This helper should be called from pfnVirtualBoxReady as it may
-     *          cause trouble when called from pfnInstalled.
-     */
-    DECLR3CALLBACKMEMBER(int, pfnRegisterVrde,(PCVBOXEXTPACKHLP pHlp, const char *pszName, bool fSetDefault));
 
     /** End of structure marker (VBOXEXTPACKHLP_VERSION). */

trunk/include/VBox/settings.h

@@ -66 +66 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
-
-typedef std::list<com::Utf8Str> VRDELibrariesList;
 
 /**
@@ -227 +225 @@
     com::Utf8Str            strVRDEAuthLibrary;
     com::Utf8Str            strWebServiceAuthLibrary;
-    com::Utf8Str            strDefaultVRDELibrary;
+    com::Utf8Str            strDefaultVRDEExtPack;
     uint32_t                ulLogHistoryCount;
 };
@@ -256 +254 @@
     void readMachineRegistry(const xml::ElementNode &elmMachineRegistry);
     void readDHCPServers(const xml::ElementNode &elmDHCPServers);
-    void readVRDE(const xml::ElementNode &elmVRDE);
-    void buildVRDE(xml::ElementNode &elmParent, const VRDELibrariesList &me);
 
     void write(const com::Utf8Str strFilename);
@@ -267 +263 @@
     DHCPServersList         llDhcpServers;
     StringsMap              mapExtraDataItems;
-    VRDELibrariesList       llVRDELibraries;
 };
 
@@ -302 +297 @@
                     fVideoChannel;
     uint32_t        ulVideoChannelQuality;
-    com::Utf8Str    strVRDELibrary;
+    com::Utf8Str    strVrdeExtPack;
     StringsMap      mapProperties;
 };