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

Timestamp:

Aug 8, 2012 10:37:51 PM (12 years ago)

Author:

vboxsync

Message:

Guest Control 2.0: Update.

Location:

trunk/src/VBox/Main/include

Files:

• GuestCtrlImplPrivate.h (modified) (1 diff)
• GuestImpl.h (modified) (2 diffs)
• GuestSessionImpl.h (modified) (5 diffs)

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

@@ -172 +172 @@
 struct GuestProcessWaitResult
 {
+    GuestProcessWaitResult(void)
+        : mResult(ProcessWaitResult_None),
+          mRC(VINF_SUCCESS) { }
+
     /** The wait result when returning from the wait call. */
     ProcessWaitResult_T         mResult;
+    /** Optional rc to this result. */
     int                         mRC;
 };

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

@@ -132 +132 @@
                                      ULONG *aMemTotal, ULONG *aMemFree, ULONG *aMemBalloon, ULONG *aMemShared, ULONG *aMemCache,
                                      ULONG *aPageTotal, ULONG *aMemAllocTotal, ULONG *aMemFreeTotal, ULONG *aMemBalloonTotal, ULONG *aMemSharedTotal);
-    STDMETHOD(UpdateGuestAdditions)(IN_BSTR aSource, ULONG aFlags, IProgress **aProgress);
+    STDMETHOD(UpdateGuestAdditions)(IN_BSTR aSource, ComSafeArrayIn(AdditionsUpdateFlag_T, aFlags), IProgress **aProgress);
     STDMETHOD(CreateSession)(IN_BSTR aUser, IN_BSTR aPassword, IN_BSTR aDomain, IN_BSTR aSessionName, IGuestSession **aGuestSession);
     STDMETHOD(FindSession)(IN_BSTR aSessionName, ComSafeArrayOut(IGuestSession *, aSessions));
@@ -210 +210 @@
     Console    *getConsole(void) { return mParent; }
     int         sessionClose(ComObjPtr<GuestSession> pSession);
-    int         sessionCreate(const Utf8Str &strUser, const Utf8Str &aPassword, const Utf8Str &aDomain,
-                              const Utf8Str &aSessionName, ComObjPtr<GuestSession> &pGuestSession);
+    int         sessionCreate(const Utf8Str &strUser, const Utf8Str &strPassword, const Utf8Str &strDomain,
+                              const Utf8Str &strSessionName, ComObjPtr<GuestSession> &pGuestSession);
     inline bool sessionExists(uint32_t uSessionID);
     /** @}  */

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

@@ -49 +49 @@
     int setProgress(ULONG uPercent);
     int setProgressSuccess(void);
-    int setProgressErrorMsg(HRESULT hr, const Utf8Str &strMsg);
+    HRESULT setProgressErrorMsg(HRESULT hr, const Utf8Str &strMsg);
 
 protected:
@@ -70 +70 @@
                       const Utf8Str &strSource, const Utf8Str &strDest, uint32_t uFlags);
 
+    SessionTaskCopyTo(GuestSession *pSession,
+                      PRTFILE pSourceFile, size_t cbSourceOffset, size_t cbSourceSize,
+                      const Utf8Str &strDest, uint32_t uFlags);
+
     virtual ~SessionTaskCopyTo(void);
 
@@ -81 +85 @@
 
     Utf8Str  mSource;
+    PRTFILE  mSourceFile;
+    size_t   mSourceOffset;
+    size_t   mSourceSize;
     Utf8Str  mDest;
     uint32_t mCopyFileFlags;
@@ -107 +114 @@
     Utf8Str  mSource;
     Utf8Str  mDest;
+    uint32_t mFlags;
+};
+
+/**
+ * Task for automatically updating the Guest Additions on the guest.
+ */
+class SessionTaskUpdateAdditions : public GuestSessionTask
+{
+public:
+
+    SessionTaskUpdateAdditions(GuestSession *pSession,
+                               const Utf8Str &strSource, uint32_t uFlags);
+
+    virtual ~SessionTaskUpdateAdditions(void);
+
+public:
+
+    int Run(void);
+    int RunAsync(const Utf8Str &strDesc, ComObjPtr<Progress> &pProgress);
+    static int taskThread(RTTHREAD Thread, void *pvUser);
+
+protected:
+
+    /** The (optionally) specified Guest Additions .ISO on the host
+     *  which will be used for the updating process. */
+    Utf8Str  mSource;
+    /** Update flags. */
     uint32_t mFlags;
 };
@@ -216 +250 @@
     const GuestEnvironment &getEnvironment(void);
     Utf8Str                 getName(void);
+    Guest                  *getParent(void) { return mData.mParent; }
     uint32_t                getProtocolVersion(void) { return mData.mProtocolVersion; }
     int                     processClose(ComObjPtr<GuestProcess> pProcess);