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

Timestamp:

Jul 26, 2012 2:07:13 PM (13 years ago)

Author:

vboxsync

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

79508

Message:

Guest Control 2.0: Update.

Location:

trunk/src/VBox/Main/include

Files:

• GuestCtrlImplPrivate.h (modified) (1 diff)
• GuestImpl.h (modified) (1 diff)
• GuestProcessImpl.h (modified) (7 diffs)
• GuestSessionImpl.h (modified) (1 diff)

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

@@ -127 +127 @@
     void Destroy(void);
 
+    int FillData(const void *pData, size_t cbData);
+
     int Init(eVBoxGuestCtrlCallbackType enmType);
 

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

@@ -134 +134 @@
     STDMETHOD(UpdateGuestAdditions)(IN_BSTR aSource, ULONG 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));
 
     // Public methods that are not in IDL (only called internally).

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

@@ -57 +57 @@
     STDMETHOD(COMGETTER(ExecutablePath))(BSTR *aExecutablePath);
     STDMETHOD(COMGETTER(ExitCode))(LONG *aExitCode);
+    STDMETHOD(COMGETTER(Name))(BSTR *aName);
     STDMETHOD(COMGETTER(Pid))(ULONG *aPID);
     STDMETHOD(COMGETTER(Status))(ProcessStatus_T *aStatus);
@@ -62 +63 @@
     STDMETHOD(Read)(ULONG aHandle, ULONG aSize, ULONG aTimeoutMS, ComSafeArrayOut(BYTE, aData));
     STDMETHOD(Terminate)(void);
-    STDMETHOD(WaitFor)(ComSafeArrayIn(ProcessWaitForFlag_T, aFlags), ULONG aTimeoutMS, ProcessWaitResult_T *aReason);
+    STDMETHOD(WaitFor)(ULONG aWaitFlags, ULONG aTimeoutMS, ProcessWaitResult_T *aReason);
+    STDMETHOD(WaitForArray)(ComSafeArrayIn(ProcessWaitForFlag_T, aFlags), ULONG aTimeoutMS, ProcessWaitResult_T *aReason);
     STDMETHOD(Write)(ULONG aHandle, ComSafeArrayIn(BYTE, aData), ULONG aTimeoutMS, ULONG *aWritten);
     /** @}  */
@@ -79 +81 @@
     int terminateProcess(void);
     int waitFor(uint32_t fWaitFlags, ULONG uTimeoutMS, GuestProcessWaitResult &guestResult);
-    HRESULT waitResultToErrorEx(const GuestProcessWaitResult &waitResult, bool fLog);
     int writeData(ULONG uHandle, BYTE const *pbData, size_t cbData, ULONG uTimeoutMS, ULONG *puWritten);
     /** @}  */
@@ -88 +89 @@
     inline int callbackAdd(GuestCtrlCallback *pCallback, ULONG *puContextID);
     inline int callbackRemove(ULONG uContextID);
+    inline bool isAlive(void);
+    HRESULT hgcmResultToError(int rc);
     int onGuestDisconnected(GuestCtrlCallback *pCallback, PCALLBACKDATACLIENTDISCONNECTED pData);
     int onProcessInputStatus(GuestCtrlCallback *pCallback, PCALLBACKDATAEXECINSTATUS pData);
@@ -96 +99 @@
     int signalWaiters(ProcessWaitResult_T enmWaitResult, int rc = VINF_SUCCESS);
     static DECLCALLBACK(int) startProcessThread(RTTHREAD Thread, void *pvUser);
+    HRESULT waitResultToErrorEx(const GuestProcessWaitResult &waitResult, bool fLog);
     /** @}  */
 
@@ -109 +113 @@
         /** All related callbacks to this process. */
         GuestCtrlCallbacks       mCallbacks;
+        /** The process' name. */
+        Utf8Str                  mName;
         /** The process start information. */
         GuestProcessInfo         mProcess;
@@ -119 +125 @@
         /** The current process status. */
         ProcessStatus_T          mStatus;
-        /** Flag indicating whether the process has been started
-         *  so that it can't be started a second time. */
-        bool                     mStarted;
         /** The next upcoming context ID. */
         ULONG                    mNextContextID;
+        /** The mutex for protecting the waiter(s). */
+        RTSEMMUTEX               mWaitMutex;
         /** How many waiters? At the moment there can only
          *  be one. */

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

@@ -61 +61 @@
     STDMETHOD(COMGETTER(Id))(ULONG *aId);
     STDMETHOD(COMGETTER(Timeout))(ULONG *aTimeout);
+    STDMETHOD(COMSETTER(Timeout))(ULONG aTimeout);
     STDMETHOD(COMGETTER(Environment))(ComSafeArrayOut(BSTR, aEnvironment));
     STDMETHOD(COMGETTER(Processes))(ComSafeArrayOut(IGuestProcess *, aProcesses));