Changeset 42924 in vbox for trunk/src/VBox/Main

Timestamp:

Aug 22, 2012 3:34:37 PM (12 years ago)

Author:

vboxsync

Message:

GuestSessionImplTasks/Update Additions: Get rid of the env var hacks, use guest properties to detect guest OS + installation paths, revamped code.

File:

• trunk/src/VBox/Main/include/GuestSessionImpl.h (modified) (4 diffs)

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

@@ -49 +49 @@
     virtual int RunAsync(const Utf8Str &strDesc, ComObjPtr<Progress> &pProgress) = 0;
 
+protected:
+
+    int getGuestProperty(const ComObjPtr<Guest> &pGuest,
+                         const Utf8Str &strPath, Utf8Str &strValue);
     int setProgress(ULONG uPercent);
     int setProgressSuccess(void);
@@ -139 +143 @@
 protected:
 
+    /**
+     * Suported OS types for automatic updating.
+     */
+    enum eOSType
+    {
+        eOSType_Unknown = 0,
+        eOSType_Windows = 1,
+        eOSType_Linux   = 2,
+        eOSType_Solaris = 3
+    };
+
+    /**
+     * Structure representing a file to
+     * get off the .ISO, copied to the guest.
+     */
+    struct InstallerFile
+    {
+        InstallerFile(const Utf8Str &strSource,
+                      const Utf8Str &strDest,
+                      uint32_t       fFlags = 0)
+            : strSource(strSource),
+              strDest(strDest),
+              fFlags(fFlags) { }
+
+        InstallerFile(const Utf8Str          &strSource,
+                      const Utf8Str          &strDest,
+                      uint32_t                fFlags,
+                      GuestProcessStartupInfo startupInfo)
+            : strSource(strSource),
+              strDest(strDest),
+              fFlags(fFlags),
+              mProcInfo(startupInfo)
+        {
+            mProcInfo.mCommand = strDest;
+            mProcInfo.mName = strDest;
+        }
+
+        /** Source file on .ISO. */
+        Utf8Str                 strSource;
+        /** Destination file on the guest. */
+        Utf8Str                 strDest;
+        /** File flags. */
+        uint32_t                fFlags;
+        /** Optional arguments if this file needs to be
+         *  executed. */
+        GuestProcessStartupInfo mProcInfo;
+    };
+
     int copyFileToGuest(GuestSession *pSession, PRTISOFSFILE pISO,
                         Utf8Str const &strFileSource, const Utf8Str &strFileDest,
@@ -144 +196 @@
     int runFile(GuestSession *pSession, GuestProcessStartupInfo &procInfo);
 
+    /** Files to handle. */
+    std::vector<InstallerFile> mFiles;
     /** The (optionally) specified Guest Additions .ISO on the host
      *  which will be used for the updating process. */
-    Utf8Str  mSource;
+    Utf8Str                    mSource;
     /** Update flags. */
-    uint32_t mFlags;
+    uint32_t                   mFlags;
 };
 
@@ -223 +277 @@
                                IGuestProcess **aProcess);
     STDMETHOD(ProcessGet)(ULONG aPID, IGuestProcess **aProcess);
-#if 0
-    STDMETHOD(SetTimeout)(ULONG aTimeoutMS);
-#endif
     STDMETHOD(SymlinkCreate)(IN_BSTR aSource, IN_BSTR aTarget, SymlinkType_T aType);
     STDMETHOD(SymlinkExists)(IN_BSTR aSymlink, BOOL *aExists);