Changeset 34787 in vbox for trunk/src/VBox/Main/include

Timestamp:

Dec 7, 2010 2:51:18 PM (14 years ago)

Author:

vboxsync

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

68597

Message:

Main,VBoxManage,FE/Qt: Implemented IExtPackFile and dropped IExtPackManager::Install.

Location:

trunk/src/VBox/Main/include

Files:

• ExtPackManagerImpl.h (modified) (6 diffs)
• ExtPackUtil.h (modified) (4 diffs)

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

@@ -46 +46 @@
     HRESULT     FinalConstruct();
     void        FinalRelease();
-    HRESULT     initWithFile(const char *a_pszFile);
+    HRESULT     initWithFile(const char *a_pszFile, class ExtPackManager *a_pExtPackMgr);
     void        uninit();
+    RTMEMEF_NEW_AND_DELETE_OPERATORS();
     /** @}  */
 
@@ -67 +68 @@
     STDMETHOD(Install)(void);
     /** @}  */
+
+private:
+    /** @name Misc init helpers
+     * @{ */
+    HRESULT     initFailed(const char *a_pszWhyFmt, ...);
+    /** @} */
 
 private:
@@ -102 +109 @@
     HRESULT     initWithDir(VBOXEXTPACKCTX a_enmContext, const char *a_pszName, const char *a_pszDir);
     void        uninit();
+    RTMEMEF_NEW_AND_DELETE_OPERATORS();
     /** @}  */
 
@@ -188 +196 @@
                      VBOXEXTPACKCTX a_enmContext);
     void        uninit();
+    RTMEMEF_NEW_AND_DELETE_OPERATORS();
     /** @}  */
 
@@ -195 +204 @@
     STDMETHOD(Find)(IN_BSTR a_bstrName, IExtPack **a_pExtPack);
     STDMETHOD(OpenExtPackFile)(IN_BSTR a_bstrTarball, IExtPackFile **a_ppExtPackFile);
-    STDMETHOD(Install)(IN_BSTR a_bstrTarball, BSTR *a_pbstrName);
     STDMETHOD(Uninstall)(IN_BSTR a_bstrName, BOOL a_fForcedRemoval);
     STDMETHOD(Cleanup)(void);
@@ -203 +211 @@
     /** @name Internal interfaces used by other Main classes.
      * @{ */
-    void        processDropZone(void);
+    HRESULT     doInstall(ExtPackFile *a_pExtPackFile);
+    /*void        processDropZone(void);*/
     void        callAllVirtualBoxReadyHooks(void);
     void        callAllConsoleReadyHooks(IConsole *a_pConsole);

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

@@ -21 +21 @@
 #include <iprt/cpp/ministring.h>
 #include <iprt/fs.h>
+#include <iprt/vfs.h>
 
 
@@ -47 +48 @@
  * certificates are installed.  Relative to RTPathAppPrivateNoArch. */
 #define VBOX_EXTPACK_CERT_DIR           "ExtPackCertificates"
+
+/** The maximum entry name length.
+ * Play short and safe. */
+#define VBOX_EXTPACK_MAX_MEMBER_NAME_LENGTH 128
 
 
@@ -98 +103 @@
 
 iprt::MiniString   *VBoxExtPackLoadDesc(const char *a_pszDir, PVBOXEXTPACKDESC a_pExtPackDesc, PRTFSOBJINFO a_pObjInfo);
+iprt::MiniString   *VBoxExtPackLoadDescFromVfsFile(RTVFSFILE hVfsFile, PVBOXEXTPACKDESC a_pExtPackDesc, PRTFSOBJINFO a_pObjInfo);
 iprt::MiniString   *VBoxExtPackExtractNameFromTarballPath(const char *pszTarball);
 void                VBoxExtPackFreeDesc(PVBOXEXTPACKDESC a_pExtPackDesc);
@@ -108 +114 @@
 bool                VBoxExtPackIsValidModuleString(const char *pszModule);
 
+int                 VBoxExtPackValidateMember(const char *pszName, RTVFSOBJTYPE enmType, RTVFSOBJ hVfsObj, char *pszError, size_t cbError);
+int                 VBoxExtPackOpenTarFss(RTFILE hTarballFile, char *pszError, size_t cbError, PRTVFSFSSTREAM phTarFss);
+int                 VBoxExtPackValidateTarball(RTFILE hTarballFile, const char *pszExtPackName, const char *pszTarball,
+                                               char *pszError, size_t cbError, PRTMANIFEST phValidManifest, PRTVFSFILE phXmlFile);
+
 
 #endif