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

Timestamp:

Jul 27, 2012 2:03:52 PM (13 years ago)

Author:

vboxsync

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

79551

Message:

Guest Control 2.0: Update.

Location:

trunk/src/VBox/Main/include

Files:

• GuestProcessImpl.h (modified) (3 diffs)
• GuestSessionImpl.h (modified) (1 diff)

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

@@ -90 +90 @@
     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);
@@ -97 +96 @@
     int prepareExecuteEnv(const char *pszEnv, void **ppvList, ULONG *pcbList, ULONG *pcEnvVars);
     int sendCommand(uint32_t uFunction, uint32_t uParms, PVBOXHGCMSVCPARM paParms);
-    int signalWaiters(ProcessWaitResult_T enmWaitResult, int rc = VINF_SUCCESS);
+    int setErrorInternal(int rc, const Utf8Str &strMessage);
+    int setErrorExternal(void);
+    int signalWaiters(ProcessWaitResult_T enmWaitResult);
     static DECLCALLBACK(int) startProcessThread(RTTHREAD Thread, void *pvUser);
     HRESULT waitResultToErrorEx(const GuestProcessWaitResult &waitResult, bool fLog);
@@ -125 +126 @@
         /** The current process status. */
         ProcessStatus_T          mStatus;
+        /** The overall rc of the process execution. */
+        int                      mRC;
+        /** The overall error message of the
+         *  process execution. */
+        Utf8Str                  mErrorMsg;
         /** The next upcoming context ID. */
         ULONG                    mNextContextID;

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

@@ -117 +117 @@
     typedef std::vector <ComObjPtr<GuestFile> > SessionFiles;
     /** Map of guest processes. The key specifies the internal process number.
-     *  To retrieve the process' guest PID use the Id() method of the IProgress interface. */
-    typedef std::map <ULONG, ComObjPtr<GuestProcess> > SessionProcesses;
+     *  To retrieve the process' guest PID use the Id() method of the IProcess interface. */
+    typedef std::map <uint32_t, ComObjPtr<GuestProcess> > SessionProcesses;
 
 public: