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

Timestamp:

Jan 24, 2023 10:57:32 AM (2 years ago)

Author:

vboxsync

Message:

Main/Guest*: rc -> hrc/vrc. bugref:10223

Location:

trunk/src/VBox/Main

Files:

• include/GuestCtrlImplPrivate.h (modified) (28 diffs)
• include/GuestDirectoryImpl.h (modified) (2 diffs)
• include/GuestProcessImpl.h (modified) (7 diffs)
• include/GuestSessionImpl.h (modified) (5 diffs)
• include/GuestSessionImplTasks.h (modified) (2 diffs)
• src-client/GuestCtrlPrivate.cpp (modified) (47 diffs)
• src-client/GuestDirectoryImpl.cpp (modified) (3 diffs)
• src-client/GuestProcessImpl.cpp (modified) (69 diffs)
• src-client/GuestSessionImpl.cpp (modified) (128 diffs)
• src-client/GuestSessionImplTasks.cpp (modified) (13 diffs)

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

@@ -102 +102 @@
     {
         Assert(m_cRefs <= 1);
-        int rc = RTEnvDestroy(m_hEnv); AssertRC(rc);
+        int vrc = RTEnvDestroy(m_hEnv); AssertRC(vrc);
         m_hEnv = NIL_RTENV;
     }
@@ -170 +170 @@
     void reset(void)
     {
-        int rc = RTEnvReset(m_hEnv);
-        AssertRC(rc);
+        int vrc = RTEnvReset(m_hEnv);
+        AssertRC(vrc);
     }
 
@@ -215 +215 @@
         for (size_t i = 0; i < cArray; i++)
         {
-            int rc = RTEnvPutEx(m_hEnv, rArray[i].c_str());
-            if (RT_FAILURE(rc))
+            int vrc = RTEnvPutEx(m_hEnv, rArray[i].c_str());
+            if (RT_FAILURE(vrc))
             {
                 if (pidxError)
                     *pidxError = i;
-                return rc;
+                return vrc;
             }
         }
@@ -275 +275 @@
     int copyUtf8Block(const char *pszzBlock, size_t cbBlock, bool fNoEqualMeansUnset = false)
     {
-        int rc = VINF_SUCCESS;
+        int vrc = VINF_SUCCESS;
         while (cbBlock > 0 && *pszzBlock != '\0')
         {
@@ -281 +281 @@
             if (!pszEnd)
                 return VERR_BUFFER_UNDERFLOW;
-            int rc2;
+            int vrc2;
             if (fNoEqualMeansUnset || strchr(pszzBlock, '='))
-                rc2 = RTEnvPutEx(m_hEnv, pszzBlock);
+                vrc2 = RTEnvPutEx(m_hEnv, pszzBlock);
             else
-                rc2 = RTEnvSetEx(m_hEnv, pszzBlock, "");
-            if (RT_FAILURE(rc2) && RT_SUCCESS(rc))
-                rc = rc2;
+                vrc2 = RTEnvSetEx(m_hEnv, pszzBlock, "");
+            if (RT_FAILURE(vrc2) && RT_SUCCESS(vrc))
+                vrc = vrc2;
 
             /* Advance. */
@@ -298 +298 @@
 
         /* The remainder must be zero padded. */
-        if (RT_SUCCESS(rc))
+        if (RT_SUCCESS(vrc))
         {
             if (ASMMemIsZero(pszzBlock, cbBlock))
@@ -304 +304 @@
             return VERR_TOO_MUCH_DATA;
         }
-        return rc;
+        return vrc;
     }
 
@@ -318 +318 @@
     {
         size_t cchNeeded;
-        int rc = RTEnvGetEx(m_hEnv, rName.c_str(), NULL, 0, &cchNeeded);
-        if (   RT_SUCCESS(rc)
-            || rc == VERR_BUFFER_OVERFLOW)
+        int vrc = RTEnvGetEx(m_hEnv, rName.c_str(), NULL, 0, &cchNeeded);
+        if (   RT_SUCCESS(vrc)
+            || vrc == VERR_BUFFER_OVERFLOW)
         {
             try
             {
                 pValue->reserve(cchNeeded + 1);
-                rc = RTEnvGetEx(m_hEnv, rName.c_str(), pValue->mutableRaw(), pValue->capacity(), NULL);
+                vrc = RTEnvGetEx(m_hEnv, rName.c_str(), pValue->mutableRaw(), pValue->capacity(), NULL);
                 pValue->jolt();
             }
             catch (std::bad_alloc &)
             {
-                rc = VERR_NO_STR_MEMORY;
+                vrc = VERR_NO_STR_MEMORY;
             }
         }
-        return rc;
+        return vrc;
     }
 
@@ -384 +384 @@
         , m_fFlags(fFlags)
     {
-        int rc = cloneCommon(rThat, fChangeRecord);
-        if (RT_FAILURE(rc))
-            throw (Global::vboxStatusCodeToCOM(rc));
+        int vrc = cloneCommon(rThat, fChangeRecord);
+        if (RT_FAILURE(vrc))
+            throw Global::vboxStatusCodeToCOM(vrc);
     }
 
@@ -399 +399 @@
     int cloneCommon(const GuestEnvironmentBase &rThat, bool fChangeRecord)
     {
-        int   rc = VINF_SUCCESS;
+        int   vrc = VINF_SUCCESS;
         RTENV hNewEnv = NIL_RTENV;
         if (rThat.m_hEnv != NIL_RTENV)
@@ -407 +407 @@
              */
             if (RTEnvIsChangeRecord(rThat.m_hEnv) == fChangeRecord)
-                rc = RTEnvClone(&hNewEnv, rThat.m_hEnv);
+                vrc = RTEnvClone(&hNewEnv, rThat.m_hEnv);
             else
             {
                 /* Need to type convert it. */
                 if (fChangeRecord)
-                    rc = RTEnvCreateChangeRecordEx(&hNewEnv, rThat.m_fFlags);
+                    vrc = RTEnvCreateChangeRecordEx(&hNewEnv, rThat.m_fFlags);
                 else
-                    rc = RTEnvCreateEx(&hNewEnv, rThat.m_fFlags);
-                if (RT_SUCCESS(rc))
+                    vrc = RTEnvCreateEx(&hNewEnv, rThat.m_fFlags);
+                if (RT_SUCCESS(vrc))
                 {
-                    rc = RTEnvApplyChanges(hNewEnv, rThat.m_hEnv);
-                    if (RT_FAILURE(rc))
+                    vrc = RTEnvApplyChanges(hNewEnv, rThat.m_hEnv);
+                    if (RT_FAILURE(vrc))
                         RTEnvDestroy(hNewEnv);
                 }
@@ -430 +430 @@
              */
             if (fChangeRecord)
-                rc = RTEnvCreateChangeRecordEx(&hNewEnv, rThat.m_fFlags);
+                vrc = RTEnvCreateChangeRecordEx(&hNewEnv, rThat.m_fFlags);
             else
-                rc = RTEnvCreateEx(&hNewEnv, rThat.m_fFlags);
+                vrc = RTEnvCreateEx(&hNewEnv, rThat.m_fFlags);
         }
-        if (RT_SUCCESS(rc))
+        if (RT_SUCCESS(vrc))
         {
             RTEnvDestroy(m_hEnv);
@@ -440 +440 @@
             m_fFlags = rThat.m_fFlags;
         }
-        return rc;
+        return vrc;
     }
 
@@ -517 +517 @@
     GuestEnvironment &operator=(const GuestEnvironmentBase &rThat)
     {
-        int rc = copy(rThat);
-        if (RT_FAILURE(rc))
-            throw (Global::vboxStatusCodeToCOM(rc));
+        int vrc = copy(rThat);
+        if (RT_FAILURE(vrc))
+            throw Global::vboxStatusCodeToCOM(vrc);
         return *this;
     }
@@ -599 +599 @@
     GuestEnvironmentChanges &operator=(const GuestEnvironmentBase &rThat)
     {
-        int rc = copy(rThat);
-        if (RT_FAILURE(rc))
-            throw (Global::vboxStatusCodeToCOM(rc));
+        int vrc = copy(rThat);
+        if (RT_FAILURE(vrc))
+            throw Global::vboxStatusCodeToCOM(vrc);
         return *this;
     }
@@ -656 +656 @@
      *
      * @param   eType           Error type to use.
-     * @param   rc              IPRT-style rc to use.
+     * @param   vrc             VBox status code to use.
      * @param   pcszWhat        Subject to use.
      */
-    GuestErrorInfo(GuestErrorInfo::Type eType, int rc, const char *pcszWhat)
-    {
-        int rc2 = setV(eType, rc, pcszWhat);
-        if (RT_FAILURE(rc2))
-            throw rc2;
-    }
-
-    /**
-     * Returns the (IPRT-style) rc of this error.
+    GuestErrorInfo(GuestErrorInfo::Type eType, int vrc, const char *pcszWhat)
+    {
+        int vrc2 = setV(eType, vrc, pcszWhat);
+        if (RT_FAILURE(vrc2))
+            throw vrc2;
+    }
+
+    /**
+     * Returns the VBox status code for this error.
      *
      * @returns VBox status code.
      */
-    int getRc(void) const { return mRc; }
+    int getVrc(void) const { return mVrc; }
 
     /**
@@ -692 +692 @@
      * @returns VBox status code.
      * @param   eType           Error type to use.
-     * @param   rc              IPRT-style rc to use.
+     * @param   vrc             VBox status code to use.
      * @param   pcszWhat        Subject to use.
      */
-    int setV(GuestErrorInfo::Type eType, int rc, const char *pcszWhat)
+    int setV(GuestErrorInfo::Type eType, int vrc, const char *pcszWhat)
     {
         mType = eType;
-        mRc   = rc;
+        mVrc  = vrc;
         mWhat = pcszWhat;
 
@@ -708 +708 @@
     /** Error type. */
     Type    mType;
-    /** IPRT-style error code. */
-    int     mRc;
+    /** VBox status (error) code. */
+    int     mVrc;
     /** Subject string related to this error. */
     Utf8Str mWhat;
@@ -983 +983 @@
     const char *GetString(const char *pszKey) const;
     size_t      GetCount(void) const;
-    int         GetRc(void) const;
+    int         GetVrc(void) const;
     int         GetInt64Ex(const char *pszKey, int64_t *piVal) const;
     int64_t     GetInt64(const char *pszKey) const;
@@ -1057 +1057 @@
 
     GuestWaitEventPayload(void)
-        : uType(0),
-          cbData(0),
-          pvData(NULL) { }
-
-    /**
-     * Initialization constructor. Will throw() VBox status code (rc).
+        : uType(0)
+        , cbData(0)
+        , pvData(NULL)
+    { }
+
+    /**
+     * Initialization constructor.
+     *
+     * @throws  VBox status code (vrc).
      *
      * @param   uTypePayload    Payload type to set.
@@ -1068 +1071 @@
      * @param   cbPayload       Size (in bytes) of payload data to set.
      */
-    GuestWaitEventPayload(uint32_t uTypePayload,
-                          const void *pvPayload, uint32_t cbPayload)
-        : uType(0),
-          cbData(0),
-          pvData(NULL)
-    {
-        int rc = copyFrom(uTypePayload, pvPayload, cbPayload);
-        if (RT_FAILURE(rc))
-            throw rc;
+    GuestWaitEventPayload(uint32_t uTypePayload, const void *pvPayload, uint32_t cbPayload)
+        : uType(0)
+        , cbData(0)
+        , pvData(NULL)
+    {
+        int vrc = copyFrom(uTypePayload, pvPayload, cbPayload);
+        if (RT_FAILURE(vrc))
+            throw vrc;
     }
 
@@ -1141 +1143 @@
         Clear();
 
-        int rc = VINF_SUCCESS;
-
+        int vrc = VINF_SUCCESS;
         if (cbPayload)
         {
@@ -1154 +1155 @@
             }
             else
-                rc = VERR_NO_MEMORY;
+                vrc = VERR_NO_MEMORY;
         }
         else
@@ -1164 +1165 @@
         }
 
-        return rc;
+        return vrc;
     }
 
@@ -1187 +1188 @@
 public:
 
-    uint32_t                        ContextID(void) { return mCID; };
-    int                             GuestResult(void) { return mGuestRc; }
-    int                             Result(void) { return mRc; }
-    GuestWaitEventPayload &         Payload(void) { return mPayload; }
-    int                             SignalInternal(int rc, int guestRc, const GuestWaitEventPayload *pPayload);
-    int                             Wait(RTMSINTERVAL uTimeoutMS);
+    uint32_t                ContextID(void) { return mCID; };
+    int                     GuestResult(void) { return mGuestRc; }
+    int                     Result(void) { return mVrc; }
+    GuestWaitEventPayload  &Payload(void) { return mPayload; }
+    int                     SignalInternal(int vrc, int vrcGuest, const GuestWaitEventPayload *pPayload);
+    int                     Wait(RTMSINTERVAL uTimeoutMS);
 
 protected:
@@ -1200 +1201 @@
 protected:
 
-    /* Shutdown indicator. */
+    /** Shutdown indicator. */
     bool                       mfAborted;
-    /* Associated context ID (CID). */
+    /** Associated context ID (CID). */
     uint32_t                   mCID;
-    /** The event semaphore for triggering
-     *  the actual event. */
+    /** The event semaphore for triggering the actual event. */
     RTSEMEVENT                 mEventSem;
-    /** The event's overall result. If
-     *  set to VERR_GSTCTL_GUEST_ERROR,
-     *  mGuestRc will contain the actual
-     *  error code from the guest side. */
-    int                        mRc;
-    /** The event'S overall result from the
-     *  guest side. If used, mRc must be
-     *  set to VERR_GSTCTL_GUEST_ERROR. */
+    /** The event's overall result.
+     * If set to VERR_GSTCTL_GUEST_ERROR, mGuestRc will contain the actual
+     * error code from the guest side. */
+    int                        mVrc;
+    /** The event'S overall result from the guest side.
+     * If used, mVrc must be set to VERR_GSTCTL_GUEST_ERROR. */
     int                        mGuestRc;
     /** The event's payload data. Optional. */
@@ -1237 +1235 @@
     int                              Cancel(void);
     const ComPtr<IEvent>             Event(void) { return mEvent; }
-    bool                             HasGuestError(void) const { return mRc == VERR_GSTCTL_GUEST_ERROR; }
+    bool                             HasGuestError(void) const { return mVrc == VERR_GSTCTL_GUEST_ERROR; }
     int                              GetGuestError(void) const { return mGuestRc; }
     int                              SignalExternal(IEvent *pEvent);
@@ -1271 +1269 @@
      *  for external event listeners. */
     int signalWaitEvent(VBoxEventType_T aType, IEvent *aEvent);
-    /** Signals a wait event using a guest rc. */
-    int signalWaitEventInternal(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, int guestRc, const GuestWaitEventPayload *pPayload);
+    /** Signals a wait event using a guest vrc. */
+    int signalWaitEventInternal(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, int vrcGuest, const GuestWaitEventPayload *pPayload);
     /** Signals a wait event without letting public guest events know,
      *  extended director's cut version. */
-    int signalWaitEventInternalEx(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, int rc, int guestRc, const GuestWaitEventPayload *pPayload);
+    int signalWaitEventInternalEx(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, int vrc, int vrcGuest, const GuestWaitEventPayload *pPayload);
 
 public:

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

@@ -68 +68 @@
     /** @name Public internal methods.
      * @{ */
-    int            i_closeInternal(int *pGuestRc);
-    int            i_read(ComObjPtr<GuestFsObjInfo> &fsObjInfo, int *pGuestRc);
+    int            i_closeInternal(int *pvrcGuest);
+    int            i_read(ComObjPtr<GuestFsObjInfo> &fsObjInfo, int *pvrcGuest);
     int            i_readInternal(GuestFsObjData &objData, int *prcGuest);
     /** @}  */
@@ -76 +76 @@
     /** @name Public static internal methods.
      * @{ */
-    static Utf8Str i_guestErrorToString(int rcGuest, const char *pcszWhat);
+    static Utf8Str i_guestErrorToString(int vrcGuest, const char *pcszWhat);
     /** @}  */
 

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

@@ -73 +73 @@
     inline int i_checkPID(uint32_t uPID);
     ProcessStatus_T i_getStatus(void);
-    int i_readData(uint32_t uHandle, uint32_t uSize, uint32_t uTimeoutMS, void *pvData, size_t cbData, uint32_t *pcbRead, int *pGuestRc);
-    int i_startProcess(uint32_t cMsTimeout, int *pGuestRc);
-    int i_startProcessInner(uint32_t cMsTimeout, AutoWriteLock &rLock, GuestWaitEvent *pEvent, int *pGuestRc);
+    int i_readData(uint32_t uHandle, uint32_t uSize, uint32_t uTimeoutMS, void *pvData, size_t cbData, uint32_t *pcbRead, int *pvrcGuest);
+    int i_startProcess(uint32_t cMsTimeout, int *pvrcGuest);
+    int i_startProcessInner(uint32_t cMsTimeout, AutoWriteLock &rLock, GuestWaitEvent *pEvent, int *pvrcGuest);
     int i_startProcessAsync(void);
-    int i_terminateProcess(uint32_t uTimeoutMS, int *pGuestRc);
+    int i_terminateProcess(uint32_t uTimeoutMS, int *pvrcGuest);
     ProcessWaitResult_T i_waitFlagsToResult(uint32_t fWaitFlags);
-    int i_waitFor(uint32_t fWaitFlags, ULONG uTimeoutMS, ProcessWaitResult_T &waitResult, int *pGuestRc);
+    int i_waitFor(uint32_t fWaitFlags, ULONG uTimeoutMS, ProcessWaitResult_T &waitResult, int *pvrcGuest);
     int i_waitForInputNotify(GuestWaitEvent *pEvent, uint32_t uHandle, uint32_t uTimeoutMS, ProcessInputStatus_T *pInputStatus, uint32_t *pcbProcessed);
     int i_waitForOutput(GuestWaitEvent *pEvent, uint32_t uHandle, uint32_t uTimeoutMS, void* pvData, size_t cbData, uint32_t *pcbRead);
-    int i_waitForStatusChange(GuestWaitEvent *pEvent, uint32_t uTimeoutMS, ProcessStatus_T *pProcessStatus, int *pGuestRc);
-    int i_writeData(uint32_t uHandle, uint32_t uFlags, void *pvData, size_t cbData, uint32_t uTimeoutMS, uint32_t *puWritten, int *pGuestRc);
+    int i_waitForStatusChange(GuestWaitEvent *pEvent, uint32_t uTimeoutMS, ProcessStatus_T *pProcessStatus, int *pvrcGuest);
+    int i_writeData(uint32_t uHandle, uint32_t uFlags, void *pvData, size_t cbData, uint32_t uTimeoutMS, uint32_t *puWritten, int *pvrcGuest);
     /** @}  */
 
     /** @name Static internal methods.
      * @{ */
-    static Utf8Str i_guestErrorToString(int rcGuest, const char *pcszWhat);
+    static Utf8Str i_guestErrorToString(int vrcGuest, const char *pcszWhat);
     static Utf8Str i_statusToString(ProcessStatus_T enmStatus);
     static bool i_isGuestError(int guestRc);
@@ -108 +108 @@
     int i_onProcessOutput(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, PVBOXGUESTCTRLHOSTCALLBACK pSvcCbData);
     int i_prepareExecuteEnv(const char *pszEnv, void **ppvList, ULONG *pcbList, ULONG *pcEnvVars);
-    int i_setProcessStatus(ProcessStatus_T procStatus, int procRc);
+    int i_setProcessStatus(ProcessStatus_T procStatus, int vrcProc);
     static int i_startProcessThreadTask(GuestProcessStartTask *pTask);
     /** @}  */
@@ -210 +210 @@
 struct GuestProcessToolErrorInfo
 {
-    /** Return code from the guest side for executing the process tool. */
-    int     rcGuest;
+    /** Return (VBox status) code from the guest side for executing the process tool. */
+    int     vrcGuest;
     /** The process tool's returned exit code. */
     int32_t iExitCode;
@@ -240 +240 @@
 public:
 
-    int init(GuestSession *pGuestSession, const GuestProcessStartupInfo &startupInfo, bool fAsync, int *pGuestRc);
+    int init(GuestSession *pGuestSession, const GuestProcessStartupInfo &startupInfo, bool fAsync, int *pvrcGuest);
 
     void uninit(void);
@@ -254 +254 @@
     GuestProcessStream &getStdErr(void) { return mStdErr; }
 
-    int wait(uint32_t fToolWaitFlags, int *pGuestRc);
-
-    int waitEx(uint32_t fToolWaitFlags, GuestProcessStreamBlock *pStreamBlock, int *pGuestRc);
+    int wait(uint32_t fToolWaitFlags, int *pvrcGuest);
+
+    int waitEx(uint32_t fToolWaitFlags, GuestProcessStreamBlock *pStreamBlock, int *pvrcGuest);
 
     bool isRunning(void);
@@ -264 +264 @@
     int getTerminationStatus(int32_t *piExitCode = NULL);
 
-    int terminate(uint32_t uTimeoutMS, int *pGuestRc);
+    int terminate(uint32_t uTimeoutMS, int *pvrcGuest);
 
 public:
@@ -270 +270 @@
     /** Wrapped @name Static run methods.
      * @{ */
-    static int run(GuestSession *pGuestSession, const GuestProcessStartupInfo &startupInfo, int *pGuestRc);
+    static int run(GuestSession *pGuestSession, const GuestProcessStartupInfo &startupInfo, int *pvrcGuest);
 
     static int runErrorInfo(GuestSession *pGuestSession, const GuestProcessStartupInfo &startupInfo, GuestProcessToolErrorInfo &errorInfo);
 
     static int runEx(GuestSession *pGuestSession, const GuestProcessStartupInfo &startupInfo,
-                     GuestCtrlStreamObjects *pStrmOutObjects, uint32_t cStrmOutObjects, int *pGuestRc);
+                     GuestCtrlStreamObjects *pStrmOutObjects, uint32_t cStrmOutObjects, int *pvrcGuest);
 
     static int runExErrorInfo(GuestSession *pGuestSession, const GuestProcessStartupInfo &startupInfo,

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

@@ -291 +291 @@
     HRESULT                 i_copyToGuest(const GuestSessionFsSourceSet &SourceSet, const com::Utf8Str &strDestination,
                                           ComPtr<IProgress> &pProgress);
-    int                     i_closeSession(uint32_t uFlags, uint32_t uTimeoutMS, int *pGuestRc);
+    int                     i_closeSession(uint32_t uFlags, uint32_t uTimeoutMS, int *pvrcGuest);
     HRESULT                 i_directoryCopyFlagFromStr(const com::Utf8Str &strFlags, bool fStrict, DirectoryCopyFlag_T *pfFlags);
     bool                    i_directoryExists(const Utf8Str &strPath);
     inline bool             i_directoryExists(uint32_t uDirID, ComObjPtr<GuestDirectory> *pDir);
     int                     i_directoryUnregister(GuestDirectory *pDirectory);
-    int                     i_directoryRemove(const Utf8Str &strPath, uint32_t fFlags, int *pGuestRc);
-    int                     i_directoryCreate(const Utf8Str &strPath, uint32_t uMode, uint32_t uFlags, int *pGuestRc);
+    int                     i_directoryRemove(const Utf8Str &strPath, uint32_t fFlags, int *pvrcGuest);
+    int                     i_directoryCreate(const Utf8Str &strPath, uint32_t uMode, uint32_t uFlags, int *pvrcGuest);
     int                     i_directoryOpen(const GuestDirectoryOpenInfo &openInfo,
-                                            ComObjPtr<GuestDirectory> &pDirectory, int *pGuestRc);
-    int                     i_directoryQueryInfo(const Utf8Str &strPath, bool fFollowSymlinks, GuestFsObjData &objData, int *pGuestRc);
+                                            ComObjPtr<GuestDirectory> &pDirectory, int *pvrcGuest);
+    int                     i_directoryQueryInfo(const Utf8Str &strPath, bool fFollowSymlinks, GuestFsObjData &objData, int *pvrcGuest);
     int                     i_dispatchToObject(PVBOXGUESTCTRLHOSTCBCTX pCtxCb, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb);
     int                     i_dispatchToThis(PVBOXGUESTCTRLHOSTCBCTX pCtxCb, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb);
@@ -306 +306 @@
     inline bool             i_fileExists(uint32_t uFileID, ComObjPtr<GuestFile> *pFile);
     int                     i_fileUnregister(GuestFile *pFile);
-    int                     i_fileRemove(const Utf8Str &strPath, int *pGuestRc);
+    int                     i_fileRemove(const Utf8Str &strPath, int *pvrcGuest);
     int                     i_fileOpenEx(const com::Utf8Str &aPath, FileAccessMode_T aAccessMode, FileOpenAction_T aOpenAction,
                                          FileSharingMode_T aSharingMode, ULONG aCreationMode,
                                          const std::vector<FileOpenExFlag_T> &aFlags,
-                                         ComObjPtr<GuestFile> &pFile, int *prcGuest);
-    int                     i_fileOpen(const GuestFileOpenInfo &openInfo, ComObjPtr<GuestFile> &pFile, int *pGuestRc);
-    int                     i_fileQueryInfo(const Utf8Str &strPath, bool fFollowSymlinks, GuestFsObjData &objData, int *pGuestRc);
-    int                     i_fileQuerySize(const Utf8Str &strPath, bool fFollowSymlinks, int64_t *pllSize, int *pGuestRc);
+                                         ComObjPtr<GuestFile> &pFile, int *pvrcGuest);
+    int                     i_fileOpen(const GuestFileOpenInfo &openInfo, ComObjPtr<GuestFile> &pFile, int *pvrcGuest);
+    int                     i_fileQueryInfo(const Utf8Str &strPath, bool fFollowSymlinks, GuestFsObjData &objData, int *pvrcGuest);
+    int                     i_fileQuerySize(const Utf8Str &strPath, bool fFollowSymlinks, int64_t *pllSize, int *pvrcGuest);
     int                     i_fsCreateTemp(const Utf8Str &strTemplate, const Utf8Str &strPath, bool fDirectory,
-                                           Utf8Str &strName, uint32_t fMode, bool fSecure, int *pGuestRc);
-    int                     i_fsQueryInfo(const Utf8Str &strPath, bool fFollowSymlinks, GuestFsObjData &objData, int *pGuestRc);
+                                           Utf8Str &strName, uint32_t fMode, bool fSecure, int *pvrcGuest);
+    int                     i_fsQueryInfo(const Utf8Str &strPath, bool fFollowSymlinks, GuestFsObjData &objData, int *pvrcGuest);
     const GuestCredentials &i_getCredentials(void);
     EventSource            *i_getEventSource(void) { return mEventSource; }
@@ -328 +328 @@
     PathStyle_T             i_getGuestPathStyle(void);
     static PathStyle_T      i_getHostPathStyle(void);
-    int                     i_startSession(int *pGuestRc);
+    int                     i_startSession(int *pvrcGuest);
     int                     i_startSessionAsync(void);
     Guest                  *i_getParent(void) { return mParent; }
@@ -336 +336 @@
     int                     i_objectsUnregister(void);
     int                     i_objectsNotifyAboutStatusChange(GuestSessionStatus_T enmSessionStatus);
-    int                     i_pathRename(const Utf8Str &strSource, const Utf8Str &strDest, uint32_t uFlags, int *pGuestRc);
-    int                     i_pathUserDocuments(Utf8Str &strPath, int *prcGuest);
-    int                     i_pathUserHome(Utf8Str &strPath, int *prcGuest);
+    int                     i_pathRename(const Utf8Str &strSource, const Utf8Str &strDest, uint32_t uFlags, int *pvrcGuest);
+    int                     i_pathUserDocuments(Utf8Str &strPath, int *pvrcGuest);
+    int                     i_pathUserHome(Utf8Str &strPath, int *pvrcGuest);
     int                     i_processUnregister(GuestProcess *pProcess);
     int                     i_processCreateEx(GuestProcessStartupInfo &procInfo, ComObjPtr<GuestProcess> &pProgress);
@@ -345 +345 @@
     int                     i_sendMessage(uint32_t uFunction, uint32_t uParms, PVBOXHGCMSVCPARM paParms,
                                           uint64_t fDst = VBOX_GUESTCTRL_DST_SESSION);
-    int                     i_setSessionStatus(GuestSessionStatus_T sessionStatus, int sessionRc);
-    int                     i_signalWaiters(GuestSessionWaitResult_T enmWaitResult, int rc /*= VINF_SUCCESS */);
-    int                     i_shutdown(uint32_t fFlags, int *prcGuest);
+    int                     i_setSessionStatus(GuestSessionStatus_T sessionStatus, int vrcSession);
+    int                     i_signalWaiters(GuestSessionWaitResult_T enmWaitResult, int vrc /*= VINF_SUCCESS */);
+    int                     i_shutdown(uint32_t fFlags, int *pvrcGuest);
     int                     i_determineProtocolVersion(void);
-    int                     i_waitFor(uint32_t fWaitFlags, ULONG uTimeoutMS, GuestSessionWaitResult_T &waitResult, int *pGuestRc);
+    int                     i_waitFor(uint32_t fWaitFlags, ULONG uTimeoutMS, GuestSessionWaitResult_T &waitResult, int *pvrcGuest);
     int                     i_waitForStatusChange(GuestWaitEvent *pEvent, uint32_t fWaitFlags, uint32_t uTimeoutMS,
-                                                  GuestSessionStatus_T *pSessionStatus, int *pGuestRc);
+                                                  GuestSessionStatus_T *pSessionStatus, int *pvrcGuest);
     /** @}  */
 

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

@@ -218 +218 @@
     {
         setTaskDesc(strTaskDesc);
-        int rc = createAndSetProgressObject(); /* Single operation by default. */
-        if (RT_FAILURE(rc))
-            return E_FAIL;
-
-        return S_OK;
+        int vrc = createAndSetProgressObject(); /* Single operation by default. */
+        if (RT_SUCCESS(vrc))
+            return S_OK;
+        return E_FAIL;
     }
 
@@ -262 +261 @@
     int setProgress(ULONG uPercent);
     int setProgressSuccess(void);
-    HRESULT setProgressErrorMsg(HRESULT hr, const Utf8Str &strMsg);
-    HRESULT setProgressErrorMsg(HRESULT hr, const Utf8Str &strMsg, const GuestErrorInfo &guestErrorInfo);
+    HRESULT setProgressErrorMsg(HRESULT hrc, const Utf8Str &strMsg);
+    HRESULT setProgressErrorMsg(HRESULT hrc, const Utf8Str &strMsg, const GuestErrorInfo &guestErrorInfo);
 
     inline void setTaskDesc(const Utf8Str &strTaskDesc) throw()

trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp

@@ -203 +203 @@
 
     /* Object size. */
-    int rc = strmBlk.GetInt64Ex("st_size", &mObjectSize);
-    ASSERT_GUEST_RC_RETURN(rc, rc);
+    int vrc = strmBlk.GetInt64Ex("st_size", &mObjectSize);
+    ASSERT_GUEST_RC_RETURN(vrc, vrc);
     strmBlk.GetInt64Ex("alloc", &mAllocatedSize);
 
@@ -261 +261 @@
     mName = strmBlk.GetString("fname");
 
-    /* Return the stream block's rc. */
-    return strmBlk.GetRc();
+    /* Return the stream block's vrc. */
+    return strmBlk.GetVrc();
 }
 
@@ -296 +296 @@
     ASSERT_GUEST_RETURN(mName.isNotEmpty(), VERR_NOT_FOUND);
 
-    /* Assign the stream block's rc. */
-    int rc = strmBlk.GetRc();
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+    /* Assign the stream block's vrc. */
+    int const vrc = strmBlk.GetVrc();
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -426 +425 @@
  * @retval  VERR_NOT_FOUND if the return code string ("rc") was not found.
  */
-int GuestProcessStreamBlock::GetRc(void) const
+int GuestProcessStreamBlock::GetVrc(void) const
 {
     const char *pszValue = GetString("rc");
     if (pszValue)
-    {
         return RTStrToInt16(pszValue);
-    }
     /** @todo We probably should have a dedicated error for that, VERR_GSTCTL_GUEST_TOOLBOX_whatever. */
     return VERR_NOT_FOUND;
@@ -491 +488 @@
     {
         int32_t iRet;
-        int rc = RTStrToInt32Full(pszValue, 0, &iRet);
-        if (RT_SUCCESS(rc))
+        int vrc = RTStrToInt32Full(pszValue, 0, &iRet);
+        if (RT_SUCCESS(vrc))
             return iRet;
         ASSERT_GUEST_MSG_FAILED(("%s=%s\n", pszKey, pszValue));
@@ -525 +522 @@
     AssertPtrReturn(pszKey, VERR_INVALID_POINTER);
 
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
     try
     {
-        Utf8Str Utf8Key(pszKey);
+        Utf8Str const strKey(pszKey);
 
         /* Take a shortcut and prevent crashes on some funny versions
@@ -534 +531 @@
         if (!mPairs.empty())
         {
-            GuestCtrlStreamPairMapIter it = mPairs.find(Utf8Key);
+            GuestCtrlStreamPairMapIter it = mPairs.find(strKey);
             if (it != mPairs.end())
                  mPairs.erase(it);
@@ -542 +539 @@
         {
             GuestProcessStreamValue val(pszValue);
-            mPairs[Utf8Key] = val;
-        }
-    }
-    catch (const std::exception &ex)
-    {
-        RT_NOREF(ex);
-    }
-    return rc;
+            mPairs[strKey] = val;
+        }
+    }
+    catch (const std::exception &)
+    {
+        /** @todo set vrc?   */
+    }
+    return vrc;
 }
 
@@ -579 +576 @@
     AssertReturn(cbData, VERR_INVALID_PARAMETER);
 
-    int rc = VINF_SUCCESS;
+    int vrc = VINF_SUCCESS;
 
     /* Rewind the buffer if it's empty. */
@@ -620 +617 @@
                 }
                 else
-                    rc = VERR_NO_MEMORY;
+                    vrc = VERR_NO_MEMORY;
             }
             else
-                rc = VERR_TOO_MUCH_DATA;
+                vrc = VERR_TOO_MUCH_DATA;
         }
 
         /* Finally, copy the data. */
-        if (RT_SUCCESS(rc))
+        if (RT_SUCCESS(vrc))
         {
             if (cbData + m_cbUsed <= m_cbAllocated)
@@ -635 +632 @@
             }
             else
-                rc = VERR_BUFFER_OVERFLOW;
-        }
-    }
-
-    return rc;
+                vrc = VERR_BUFFER_OVERFLOW;
+        }
+    }
+
+    return vrc;
 }
 
@@ -671 +668 @@
 
     RTFILE hFile;
-    int rc = RTFileOpen(&hFile, pszFile, RTFILE_O_CREATE_REPLACE | RTFILE_O_WRITE | RTFILE_O_DENY_WRITE);
-    if (RT_SUCCESS(rc))
-    {
-        rc = RTFileWrite(hFile, m_pbBuffer, m_cbUsed, NULL /* pcbWritten */);
+    int vrc = RTFileOpen(&hFile, pszFile, RTFILE_O_CREATE_REPLACE | RTFILE_O_WRITE | RTFILE_O_DENY_WRITE);
+    if (RT_SUCCESS(vrc))
+    {
+        vrc = RTFileWrite(hFile, m_pbBuffer, m_cbUsed, NULL /* pcbWritten */);
         RTFileClose(hFile);
     }
@@ -707 +704 @@
         return VERR_NO_DATA;
 
-    int          rc        = VINF_SUCCESS;
+    int          vrc       = VINF_SUCCESS;
     char * const pszOff    = (char *)&m_pbBuffer[m_offBuffer];
     size_t       cbLeft    = m_offBuffer < m_cbUsed ? m_cbUsed - m_offBuffer : 0;
@@ -716 +713 @@
         if (!pszPairEnd)
         {
-            rc = VERR_MORE_DATA;
+            vrc = VERR_MORE_DATA;
             break;
         }
@@ -725 +722 @@
         else
         {
-            rc = VERR_MORE_DATA; /** @todo r=bird: This is BOGUS because we'll be stuck here if the guest feeds us bad data! */
+            vrc = VERR_MORE_DATA; /** @todo r=bird: This is BOGUS because we'll be stuck here if the guest feeds us bad data! */
             break;
         }
         char const * const pszVal = pszSep + 1;
 
-        rc = streamBlock.SetValue(pszStart, pszVal);
-        if (RT_FAILURE(rc))
-            return rc;
+        vrc = streamBlock.SetValue(pszStart, pszVal);
+        if (RT_FAILURE(vrc))
+            return vrc;
 
         /* Next pair. */
@@ -750 +747 @@
     m_offBuffer += cbDistance;
 
-    return rc;
+    return vrc;
 }
 
@@ -770 +767 @@
 int GuestBase::baseInit(void)
 {
-    int rc = RTCritSectInit(&mWaitEventCritSect);
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+    int const vrc = RTCritSectInit(&mWaitEventCritSect);
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -784 +780 @@
 
     /* Make sure to cancel any outstanding wait events. */
-    int rc2 = cancelWaitEvents();
-    AssertRC(rc2);
-
-    rc2 = RTCritSectDelete(&mWaitEventCritSect);
-    AssertRC(rc2);
-
-    LogFlowFuncLeaveRC(rc2);
+    int vrc2 = cancelWaitEvents();
+    AssertRC(vrc2);
+
+    vrc2 = RTCritSectDelete(&mWaitEventCritSect);
+    AssertRC(vrc2);
+
+    LogFlowFuncLeaveRC(vrc2);
     /* No return value. */
 }
@@ -803 +799 @@
     LogFlowThisFuncEnter();
 
-    int rc = RTCritSectEnter(&mWaitEventCritSect);
-    if (RT_SUCCESS(rc))
+    int vrc = RTCritSectEnter(&mWaitEventCritSect);
+    if (RT_SUCCESS(vrc))
     {
         GuestEventGroup::iterator itEventGroups = mWaitEventGroups.begin();
@@ -820 +816 @@
                  * is done by the caller using unregisterWaitEvent().
                  */
-                int rc2 = pEvent->Cancel();
-                AssertRC(rc2);
+                int vrc2 = pEvent->Cancel();
+                AssertRC(vrc2);
 
                 ++itEvents;
@@ -829 +825 @@
         }
 
-        int rc2 = RTCritSectLeave(&mWaitEventCritSect);
-        if (RT_SUCCESS(rc))
-            rc = rc2;
-    }
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+        int vrc2 = RTCritSectLeave(&mWaitEventCritSect);
+        if (RT_SUCCESS(vrc))
+            vrc = vrc2;
+    }
+
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -884 +880 @@
                         vrc = signalWaitEventInternal(pCtxCb, dataCb.rc, &evPayload);
                     }
-                    catch (int rcEx) /* Thrown by GuestWaitEventPayload constructor. */
+                    catch (int vrcEx) /* Thrown by GuestWaitEventPayload constructor. */
                     {
-                        vrc = rcEx;
+                        vrc = vrcEx;
                     }
                 }
@@ -903 +899 @@
         vrc = VERR_NO_MEMORY;
     }
-    catch (int rc)
-    {
-        vrc = rc;
+    catch (int vrc)
+    {
+        vrc = vrc;
     }
 
@@ -990 +986 @@
 
     uint32_t idContext;
-    int rc = generateContextID(uSessionID, uObjectID, &idContext);
-    AssertRCReturn(rc, rc);
+    int vrc = generateContextID(uSessionID, uObjectID, &idContext);
+    AssertRCReturn(vrc, vrc);
 
     GuestWaitEvent *pEvent = new GuestWaitEvent();
     AssertPtrReturn(pEvent, VERR_NO_MEMORY);
 
-    rc = pEvent->Init(idContext, lstEvents);
-    AssertRCReturn(rc, rc);
+    vrc = pEvent->Init(idContext, lstEvents);
+    AssertRCReturn(vrc, vrc);
 
     LogFlowThisFunc(("New event=%p, CID=%RU32\n", pEvent, idContext));
 
-    rc = RTCritSectEnter(&mWaitEventCritSect);
-    if (RT_SUCCESS(rc))
+    vrc = RTCritSectEnter(&mWaitEventCritSect);
+    if (RT_SUCCESS(vrc))
     {
         /*
@@ -1015 +1011 @@
             do
             {
-                rc = generateContextID(uSessionID, uObjectID, &idContext);
-                AssertRCBreak(rc);
+                vrc = generateContextID(uSessionID, uObjectID, &idContext);
+                AssertRCBreak(vrc);
                 LogFunc(("Found context ID duplicate; trying a different context ID: %#x\n", idContext));
                 if (mWaitEvents.find(idContext) != mWaitEvents.end())
-                    rc = VERR_GSTCTL_MAX_CID_COUNT_REACHED;
-            } while (RT_FAILURE_NP(rc) && cTries++ < 10);
-        }
-        if (RT_SUCCESS(rc))
+                    vrc = VERR_GSTCTL_MAX_CID_COUNT_REACHED;
+            } while (RT_FAILURE_NP(vrc) && cTries++ < 10);
+        }
+        if (RT_SUCCESS(vrc))
         {
             /*
@@ -1045 +1041 @@
                             mWaitEventGroups[*ItType].erase(idContext);
                         }
-                        rc = VERR_NO_MEMORY;
+                        vrc = VERR_NO_MEMORY;
                         break;
                     }
@@ -1052 +1048 @@
                     Assert(cInserts > 0); /* else: lstEvents has duplicate entries. */
             }
-            if (RT_SUCCESS(rc))
+            if (RT_SUCCESS(vrc))
             {
                 Assert(cInserts > 0 || lstEvents.size() == 0);
@@ -1068 +1064 @@
                     for (GuestEventTypes::const_iterator ItType = lstEvents.begin(); ItType != lstEvents.end(); ++ItType)
                         mWaitEventGroups[*ItType].erase(idContext);
-                    rc = VERR_NO_MEMORY;
+                    vrc = VERR_NO_MEMORY;
                 }
             }
@@ -1075 +1071 @@
         RTCritSectLeave(&mWaitEventCritSect);
     }
-    if (RT_SUCCESS(rc))
+    if (RT_SUCCESS(vrc))
     {
         *ppEvent = pEvent;
-        return rc;
+        return vrc;
     }
 
@@ -1084 +1080 @@
         delete pEvent;
 
-    return rc;
+    return vrc;
 }
 
@@ -1097 +1093 @@
 int GuestBase::signalWaitEvent(VBoxEventType_T aType, IEvent *aEvent)
 {
-    int rc = RTCritSectEnter(&mWaitEventCritSect);
+    int vrc = RTCritSectEnter(&mWaitEventCritSect);
 #ifdef DEBUG
     uint32_t cEvents = 0;
 #endif
-    if (RT_SUCCESS(rc))
+    if (RT_SUCCESS(vrc))
     {
         GuestEventGroup::iterator itGroup = mWaitEventGroups.find(aType);
@@ -1114 +1110 @@
                                  VBOX_GUESTCTRL_CONTEXTID_GET_OBJECT(ItWaitEvt->first), VBOX_GUESTCTRL_CONTEXTID_GET_COUNT(ItWaitEvt->first)));
 
-                int rc2 = ItWaitEvt->second->SignalExternal(aEvent);
-                AssertRC(rc2);
+                int vrc2 = ItWaitEvt->second->SignalExternal(aEvent);
+                AssertRC(vrc2);
 
                 /* Take down the wait event object details before we erase it from this list and invalid ItGrpEvt. */
@@ -1140 +1136 @@
         }
 
-        int rc2 = RTCritSectLeave(&mWaitEventCritSect);
-        if (RT_SUCCESS(rc))
-            rc = rc2;
+        int vrc2 = RTCritSectLeave(&mWaitEventCritSect);
+        if (RT_SUCCESS(vrc))
+            vrc = vrc2;
     }
 
 #ifdef DEBUG
-    LogFlowThisFunc(("Signalled %RU32 events, rc=%Rrc\n", cEvents, rc));
+    LogFlowThisFunc(("Signalled %RU32 events, vrc=%Rrc\n", cEvents, vrc));
 #endif
-    return rc;
+    return vrc;
 }
 
@@ -1155 +1151 @@
  *
  * @returns VBox status code.
- * @param   pCbCtx              Pointer to host service callback context.
- * @param   rcGuest             Guest return code (rc) to set additionally, if rc is set to VERR_GSTCTL_GUEST_ERROR.
- * @param   pPayload            Additional wait event payload data set set on return. Optional.
- */
-int GuestBase::signalWaitEventInternal(PVBOXGUESTCTRLHOSTCBCTX pCbCtx,
-                                       int rcGuest, const GuestWaitEventPayload *pPayload)
-{
-    if (RT_SUCCESS(rcGuest))
-        return signalWaitEventInternalEx(pCbCtx, VINF_SUCCESS,
-                                         0 /* Guest rc */, pPayload);
-
-    return signalWaitEventInternalEx(pCbCtx, VERR_GSTCTL_GUEST_ERROR,
-                                     rcGuest, pPayload);
+ * @param   pCbCtx      Pointer to host service callback context.
+ * @param   vrcGuest    Guest return VBox status code to set.
+ * @param   pPayload    Additional wait event payload data set set on return. Optional.
+ */
+int GuestBase::signalWaitEventInternal(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, int vrcGuest, const GuestWaitEventPayload *pPayload)
+{
+    if (RT_SUCCESS(vrcGuest))
+        return signalWaitEventInternalEx(pCbCtx, VINF_SUCCESS, VINF_SUCCESS /* vrcGuest */, pPayload);
+
+    return signalWaitEventInternalEx(pCbCtx, VERR_GSTCTL_GUEST_ERROR, vrcGuest, pPayload);
 }
 
@@ -1175 +1168 @@
  *
  * @returns VBox status code.
- * @param   pCbCtx              Pointer to host service callback context.
- * @param   rc                  Return code (rc) to set as wait result.
- * @param   rcGuest             Guest return code (rc) to set additionally, if rc is set to VERR_GSTCTL_GUEST_ERROR.
- * @param   pPayload            Additional wait event payload data set set on return. Optional.
- */
-int GuestBase::signalWaitEventInternalEx(PVBOXGUESTCTRLHOSTCBCTX pCbCtx,
-                                         int rc, int rcGuest,
+ * @param   pCbCtx      Pointer to host service callback context.
+ * @param   vrc         Return VBox status code to set as wait result.
+ * @param   vrcGuest    Guest return VBox status code to set additionally, if
+ *                      vrc is set to VERR_GSTCTL_GUEST_ERROR.
+ * @param   pPayload    Additional wait event payload data set set on return. Optional.
+ */
+int GuestBase::signalWaitEventInternalEx(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, int vrc, int vrcGuest,
                                          const GuestWaitEventPayload *pPayload)
 {
@@ -1187 +1180 @@
     /* pPayload is optional. */
 
-    int rc2 = RTCritSectEnter(&mWaitEventCritSect);
-    if (RT_SUCCESS(rc2))
+    int vrc2 = RTCritSectEnter(&mWaitEventCritSect);
+    if (RT_SUCCESS(vrc2))
     {
         GuestWaitEvents::iterator itEvent = mWaitEvents.find(pCbCtx->uContextID);
         if (itEvent != mWaitEvents.end())
         {
-            LogFlowThisFunc(("Signalling event=%p (CID %RU32, rc=%Rrc, rcGuest=%Rrc, pPayload=%p) ...\n",
-                             itEvent->second, itEvent->first, rc, rcGuest, pPayload));
+            LogFlowThisFunc(("Signalling event=%p (CID %RU32, vrc=%Rrc, vrcGuest=%Rrc, pPayload=%p) ...\n",
+                             itEvent->second, itEvent->first, vrc, vrcGuest, pPayload));
             GuestWaitEvent *pEvent = itEvent->second;
             AssertPtr(pEvent);
-            rc2 = pEvent->SignalInternal(rc, rcGuest, pPayload);
+            vrc2 = pEvent->SignalInternal(vrc, vrcGuest, pPayload);
         }
         else
-            rc2 = VERR_NOT_FOUND;
-
-        int rc3 = RTCritSectLeave(&mWaitEventCritSect);
-        if (RT_SUCCESS(rc2))
-            rc2 = rc3;
-    }
-
-    return rc2;
+            vrc2 = VERR_NOT_FOUND;
+
+        int vrc3 = RTCritSectLeave(&mWaitEventCritSect);
+        if (RT_SUCCESS(vrc2))
+            vrc2 = vrc3;
+    }
+
+    return vrc2;
 }
 
@@ -1223 +1216 @@
         return VINF_SUCCESS;
 
-    int rc = RTCritSectEnter(&mWaitEventCritSect);
-    if (RT_SUCCESS(rc))
+    int vrc = RTCritSectEnter(&mWaitEventCritSect);
+    if (RT_SUCCESS(vrc))
     {
         LogFlowThisFunc(("pWaitEvt=%p\n", pWaitEvt));
@@ -1281 +1274 @@
         {
             RT_NOREF(ex);
-            AssertFailedStmt(rc = VERR_NOT_FOUND);
-        }
-
-        int rc2 = RTCritSectLeave(&mWaitEventCritSect);
-        if (RT_SUCCESS(rc))
-            rc = rc2;
-    }
-
-    return rc;
+            AssertFailedStmt(vrc = VERR_NOT_FOUND);
+        }
+
+        int vrc2 = RTCritSectLeave(&mWaitEventCritSect);
+        if (RT_SUCCESS(vrc))
+            vrc = vrc2;
+    }
+
+    return vrc;
 }
 
@@ -1318 +1311 @@
             if (pType)
             {
-                HRESULT hr = pThisEvent->COMGETTER(Type)(pType);
-                if (FAILED(hr))
+                HRESULT hrc = pThisEvent->COMGETTER(Type)(pType);
+                if (FAILED(hrc))
                     vrc = VERR_COM_UNEXPECTED;
             }
@@ -1355 +1348 @@
 /* static */ Utf8Str GuestBase::getErrorAsString(const GuestErrorInfo& guestErrorInfo)
 {
-    AssertMsg(RT_FAILURE(guestErrorInfo.getRc()), ("Guest rc does not indicate a failure\n"));
+    AssertMsg(RT_FAILURE(guestErrorInfo.getVrc()), ("Guest vrc does not indicate a failure\n"));
 
     Utf8Str strErr;
@@ -1369 +1362 @@
     {
         case GuestErrorInfo::Type_Session:
-            strErr = GuestSession::i_guestErrorToString(guestErrorInfo.getRc());
+            strErr = GuestSession::i_guestErrorToString(guestErrorInfo.getVrc());
             break;
 
         case GuestErrorInfo::Type_Process:
-            strErr = GuestProcess::i_guestErrorToString(guestErrorInfo.getRc(), guestErrorInfo.getWhat().c_str());
+            strErr = GuestProcess::i_guestErrorToString(guestErrorInfo.getVrc(), guestErrorInfo.getWhat().c_str());
             break;
 
         case GuestErrorInfo::Type_File:
-            strErr = GuestFile::i_guestErrorToString(guestErrorInfo.getRc(), guestErrorInfo.getWhat().c_str());
+            strErr = GuestFile::i_guestErrorToString(guestErrorInfo.getVrc(), guestErrorInfo.getWhat().c_str());
             break;
 
         case GuestErrorInfo::Type_Directory:
-            strErr = GuestDirectory::i_guestErrorToString(guestErrorInfo.getRc(), guestErrorInfo.getWhat().c_str());
+            strErr = GuestDirectory::i_guestErrorToString(guestErrorInfo.getVrc(), guestErrorInfo.getWhat().c_str());
             break;
 
@@ -1392 +1385 @@
 
         default:
-            AssertMsgFailed(("Type not implemented (type=%RU32, rc=%Rrc)\n", guestErrorInfo.getType(), guestErrorInfo.getRc()));
-            strErr = Utf8StrFmt("Unknown / Not implemented -- Please file a bug report (type=%RU32, rc=%Rrc)\n",
-                                guestErrorInfo.getType(), guestErrorInfo.getRc());
+            AssertMsgFailed(("Type not implemented (type=%RU32, vrc=%Rrc)\n", guestErrorInfo.getType(), guestErrorInfo.getVrc()));
+            strErr = Utf8StrFmt("Unknown / Not implemented -- Please file a bug report (type=%RU32, vrc=%Rrc)\n",
+                                guestErrorInfo.getType(), guestErrorInfo.getVrc());
             break;
     }
@@ -1552 +1545 @@
       mCID(0),
       mEventSem(NIL_RTSEMEVENT),
-      mRc(VINF_SUCCESS),
+      mVrc(VINF_SUCCESS),
       mGuestRc(VINF_SUCCESS)
 {
@@ -1583 +1576 @@
  *
  * @returns VBox status code.
- * @param   rc                  Return code (rc) to set as wait result.
- * @param   rcGuest             Guest return code (rc) to set additionally, if rc is set to VERR_GSTCTL_GUEST_ERROR.
- * @param   pPayload            Additional wait event payload data set set on return. Optional.
- */
-int GuestWaitEventBase::SignalInternal(int rc, int rcGuest,
-                                       const GuestWaitEventPayload *pPayload)
+ * @param   vrc         Return VBox status code to set as wait result.
+ * @param   vrcGuest    Guest return VBox status code to set additionally, if
+ *                      @a vrc is set to VERR_GSTCTL_GUEST_ERROR.
+ * @param   pPayload    Additional wait event payload data set set on return. Optional.
+ */
+int GuestWaitEventBase::SignalInternal(int vrc, int vrcGuest, const GuestWaitEventPayload *pPayload)
 {
     if (mfAborted)
@@ -1594 +1587 @@
 
 #ifdef VBOX_STRICT
-    if (rc == VERR_GSTCTL_GUEST_ERROR)
-        AssertMsg(RT_FAILURE(rcGuest), ("Guest error indicated but no actual guest error set (%Rrc)\n", rcGuest));
+    if (vrc == VERR_GSTCTL_GUEST_ERROR)
+        AssertMsg(RT_FAILURE(vrcGuest), ("Guest error indicated but no actual guest error set (%Rrc)\n", vrcGuest));
     else
-        AssertMsg(RT_SUCCESS(rcGuest), ("No guest error indicated but actual guest error set (%Rrc)\n", rcGuest));
+        AssertMsg(RT_SUCCESS(vrcGuest), ("No guest error indicated but actual guest error set (%Rrc)\n", vrcGuest));
 #endif
 
-    int rc2;
+    int vrc2;
     if (pPayload)
-        rc2 = mPayload.CopyFromDeep(*pPayload);
+        vrc2 = mPayload.CopyFromDeep(*pPayload);
     else
-        rc2 = VINF_SUCCESS;
-    if (RT_SUCCESS(rc2))
-    {
-        mRc = rc;
-        mGuestRc = rcGuest;
-
-        rc2 = RTSemEventSignal(mEventSem);
-    }
-
-    return rc2;
+        vrc2 = VINF_SUCCESS;
+    if (RT_SUCCESS(vrc2))
+    {
+        mVrc = vrc;
+        mGuestRc = vrcGuest;
+
+        vrc2 = RTSemEventSignal(mEventSem);
+    }
+
+    return vrc2;
 }
 
@@ -1629 +1622 @@
 int GuestWaitEventBase::Wait(RTMSINTERVAL msTimeout)
 {
-    int rc = VINF_SUCCESS;
-
-    if (mfAborted)
-        rc = VERR_CANCELLED;
-
-    if (RT_SUCCESS(rc))
+    int vrc;
+    if (!mfAborted)
     {
         AssertReturn(mEventSem != NIL_RTSEMEVENT, VERR_CANCELLED);
 
-        rc = RTSemEventWait(mEventSem, msTimeout ? msTimeout : RT_INDEFINITE_WAIT);
-        if (   RT_SUCCESS(rc)
+        vrc = RTSemEventWait(mEventSem, msTimeout ? msTimeout : RT_INDEFINITE_WAIT);
+        if (   RT_SUCCESS(vrc)
             && mfAborted)
-        {
-            rc = VERR_CANCELLED;
-        }
-
-        if (RT_SUCCESS(rc))
+            vrc = VERR_CANCELLED;
+
+        if (RT_SUCCESS(vrc))
         {
             /* If waiting succeeded, return the overall
              * result code. */
-            rc = mRc;
-        }
-    }
-
-    return rc;
+            vrc = mVrc;
+        }
+    }
+    else
+        vrc = VERR_CANCELLED;
+    return vrc;
 }
 
@@ -1701 +1689 @@
 int GuestWaitEvent::Init(uint32_t uCID, const GuestEventTypes &lstEvents)
 {
-    int rc = GuestWaitEventBase::Init(uCID);
-    if (RT_SUCCESS(rc))
-    {
+    int vrc = GuestWaitEventBase::Init(uCID);
+    if (RT_SUCCESS(vrc))
         mEventTypes = lstEvents;
-    }
-
-    return rc;
+
+    return vrc;
 }
 

trunk/src/VBox/Main/src-client/GuestDirectoryImpl.cpp

@@ -113 +113 @@
          * it later in subsequent read() calls.
          */
-        vrc = mData.mProcessTool.init(mSession, procInfo, false /* Async */, NULL /* Guest rc */);
+        vrc = mData.mProcessTool.init(mSession, procInfo, false /*fAsync*/, NULL /*pvrcGuest*/);
         if (RT_SUCCESS(vrc))
         {
@@ -244 +244 @@
  *
  * @returns Error string.
- * @param   rcGuest             Guest file error to return string for.
+ * @param   vrcGuest            Guest file error to return string for.
  * @param   pcszWhat            Hint of what was involved when the error occurred.
  */
 /* static */
-Utf8Str GuestDirectory::i_guestErrorToString(int rcGuest, const char *pcszWhat)
+Utf8Str GuestDirectory::i_guestErrorToString(int vrcGuest, const char *pcszWhat)
 {
     AssertPtrReturn(pcszWhat, "");
 
     Utf8Str strErr;
-    switch (rcGuest)
+    switch (vrcGuest)
     {
 #define CASE_MSG(a_iRc, ...) \
@@ -260 +260 @@
         CASE_MSG(VERR_DIR_NOT_EMPTY, tr("Guest directory \"%s\" is not empty"), pcszWhat);
         default:
-            strErr.printf(tr("Error %Rrc for guest directory \"%s\" occurred\n"), rcGuest, pcszWhat);
+            strErr.printf(tr("Error %Rrc for guest directory \"%s\" occurred\n"), vrcGuest, pcszWhat);
             break;
     }

trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp

@@ -223 +223 @@
     AssertReturn(autoInitSpan.isOk(), VERR_OBJECT_DESTROYED);
 
-    HRESULT hr;
+    HRESULT hrc;
 
     int vrc = bindToSession(aConsole, aSession, aObjectID);
     if (RT_SUCCESS(vrc))
     {
-        hr = unconst(mEventSource).createObject();
-        if (FAILED(hr))
+        hrc = unconst(mEventSource).createObject();
+        if (FAILED(hrc))
             vrc = VERR_NO_MEMORY;
         else
         {
-            hr = mEventSource->init();
-            if (FAILED(hr))
+            hrc = mEventSource->init();
+            if (FAILED(hrc))
                 vrc = VERR_COM_UNEXPECTED;
         }
@@ -245 +245 @@
             GuestProcessListener *pListener = new GuestProcessListener();
             ComObjPtr<GuestProcessListenerImpl> thisListener;
-            hr = thisListener.createObject();
-            if (SUCCEEDED(hr))
-                hr = thisListener->init(pListener, this);
-
-            if (SUCCEEDED(hr))
+            hrc = thisListener.createObject();
+            if (SUCCEEDED(hrc))
+                hrc = thisListener->init(pListener, this);
+
+            if (SUCCEEDED(hrc))
             {
                 com::SafeArray <VBoxEventType_T> eventTypes;
@@ -255 +255 @@
                 eventTypes.push_back(VBoxEventType_OnGuestProcessInputNotify);
                 eventTypes.push_back(VBoxEventType_OnGuestProcessOutput);
-                hr = mEventSource->RegisterListener(thisListener,
+                hrc = mEventSource->RegisterListener(thisListener,
                                                     ComSafeArrayAsInParam(eventTypes),
                                                     TRUE /* Active listener */);
-                if (SUCCEEDED(hr))
+                if (SUCCEEDED(hrc))
                 {
                     vrc = baseInit();
@@ -541 +541 @@
  *
  * @returns Error as a string.
- * @param   rcGuest             Guest process error to return string for.
- * @param   pcszWhat            Hint of what was involved when the error occurred.
+ * @param   vrcGuest    Guest process error to return string for.
+ * @param   pcszWhat    Hint of what was involved when the error occurred.
  */
 /* static */
-Utf8Str GuestProcess::i_guestErrorToString(int rcGuest, const char *pcszWhat)
+Utf8Str GuestProcess::i_guestErrorToString(int vrcGuest, const char *pcszWhat)
 {
     AssertPtrReturn(pcszWhat, "");
 
     Utf8Str strErr;
-    switch (rcGuest)
+    switch (vrcGuest)
     {
 #define CASE_MSG(a_iRc, ...) \
@@ -567 +567 @@
         CASE_MSG(VERR_NOT_FOUND,                      tr("The guest execution service is not ready (yet)"));
         default:
-            strErr.printf(tr("Error %Rrc for guest process \"%s\" occurred\n"), rcGuest, pcszWhat);
+            strErr.printf(tr("Error %Rrc for guest process \"%s\" occurred\n"), vrcGuest, pcszWhat);
             break;
 #undef CASE_MSG
@@ -622 +622 @@
  * @return  bool                @c true if the passed in error code indicates an error which came
  *                              from the guest side, or @c false if not.
- * @param   rc                  Error code to check.
+ * @param   vrc                 Error code to check.
  */
 /* static */
-bool GuestProcess::i_isGuestError(int rc)
-{
-    return (   rc == VERR_GSTCTL_GUEST_ERROR
-            || rc == VERR_GSTCTL_PROCESS_EXIT_CODE);
+bool GuestProcess::i_isGuestError(int vrc)
+{
+    return vrc == VERR_GSTCTL_GUEST_ERROR
+        || vrc == VERR_GSTCTL_PROCESS_EXIT_CODE;
 }
 
@@ -638 +638 @@
 inline bool GuestProcess::i_isAlive(void)
 {
-    return (   mData.mStatus == ProcessStatus_Started
-            || mData.mStatus == ProcessStatus_Paused
-            || mData.mStatus == ProcessStatus_Terminating);
+    return mData.mStatus == ProcessStatus_Started
+        || mData.mStatus == ProcessStatus_Paused
+        || mData.mStatus == ProcessStatus_Terminating;
 }
 
@@ -650 +650 @@
 inline bool GuestProcess::i_hasEnded(void)
 {
-    return (   mData.mStatus == ProcessStatus_TerminatedNormally
-            || mData.mStatus == ProcessStatus_TerminatedSignal
-            || mData.mStatus == ProcessStatus_TerminatedAbnormally
-            || mData.mStatus == ProcessStatus_TimedOutKilled
-            || mData.mStatus == ProcessStatus_TimedOutAbnormally
-            || mData.mStatus == ProcessStatus_Down
-            || mData.mStatus == ProcessStatus_Error);
+    return mData.mStatus == ProcessStatus_TerminatedNormally
+        || mData.mStatus == ProcessStatus_TerminatedSignal
+        || mData.mStatus == ProcessStatus_TerminatedAbnormally
+        || mData.mStatus == ProcessStatus_TimedOutKilled
+        || mData.mStatus == ProcessStatus_TimedOutAbnormally
+        || mData.mStatus == ProcessStatus_Down
+        || mData.mStatus == ProcessStatus_Error;
 }
 
@@ -802 +802 @@
     {
         ProcessStatus_T procStatus = ProcessStatus_Undefined;
-        int procRc = VINF_SUCCESS;
+        int vrcProc = VINF_SUCCESS;
 
         switch (dataCb.uStatus)
@@ -859 +859 @@
             case PROC_STS_ERROR:
             {
-                procRc = dataCb.uFlags; /* mFlags contains the IPRT error sent from the guest. */
+                vrcProc = dataCb.uFlags; /* mFlags contains the IPRT error sent from the guest. */
                 procStatus = ProcessStatus_Error;
                 break;
@@ -873 +873 @@
         }
 
-        LogFlowThisFunc(("Got rc=%Rrc, procSts=%RU32, procRc=%Rrc\n",
-                         vrc, procStatus, procRc));
+        LogFlowThisFunc(("Got vrc=%Rrc, procSts=%RU32, vrcProc=%Rrc\n", vrc, procStatus, vrcProc));
 
         /* Set the process status. */
-        int vrc2 = i_setProcessStatus(procStatus, procRc);
+        int vrc2 = i_setProcessStatus(procStatus, vrcProc);
         if (RT_SUCCESS(vrc))
             vrc = vrc2;
@@ -972 +971 @@
         AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-        vrc = i_setProcessStatus(ProcessStatus_Down, 0 /* rc, ignored */);
+        vrc = i_setProcessStatus(ProcessStatus_Down, VINF_SUCCESS /* vrcProc, ignored */);
     }
 
@@ -991 +990 @@
  * @param   pcbRead             Where to return to size (in bytes) read on success.
  *                              Optional.
- * @param   prcGuest            Where to return the guest error when VERR_GSTCTL_GUEST_ERROR
- *                              was returned. Optional.
+ * @param   pvrcGuest           Where to return the guest error when
+ *                              VERR_GSTCTL_GUEST_ERROR was returned. Optional.
  *
  * @note    Takes the write lock.
  */
 int GuestProcess::i_readData(uint32_t uHandle, uint32_t uSize, uint32_t uTimeoutMS,
-                             void *pvData, size_t cbData, uint32_t *pcbRead, int *prcGuest)
-{
-    LogFlowThisFunc(("uPID=%RU32, uHandle=%RU32, uSize=%RU32, uTimeoutMS=%RU32, pvData=%p, cbData=%RU32, prcGuest=%p\n",
-                     mData.mPID, uHandle, uSize, uTimeoutMS, pvData, cbData, prcGuest));
+                             void *pvData, size_t cbData, uint32_t *pcbRead, int *pvrcGuest)
+{
+    LogFlowThisFunc(("uPID=%RU32, uHandle=%RU32, uSize=%RU32, uTimeoutMS=%RU32, pvData=%p, cbData=%RU32, pvrcGuest=%p\n",
+                     mData.mPID, uHandle, uSize, uTimeoutMS, pvData, cbData, pvrcGuest));
     AssertReturn(uSize, VERR_INVALID_PARAMETER);
     AssertPtrReturn(pvData, VERR_INVALID_POINTER);
@@ -1020 +1019 @@
         if (pcbRead)
             *pcbRead = 0;
-        if (prcGuest)
-            *prcGuest = VINF_SUCCESS;
+        if (pvrcGuest)
+            *pvrcGuest = VINF_SUCCESS;
         return VINF_SUCCESS; /* Nothing to read anymore. */
     }
@@ -1081 +1080 @@
  * @returns VBox status code.
  * @param   procStatus          Guest process status to set.
- * @param   procRc              Guest process result code to set.
+ * @param   vrcProc             Guest process result code to set.
  *
  * @note    Takes the write lock.
  */
-int GuestProcess::i_setProcessStatus(ProcessStatus_T procStatus, int procRc)
+int GuestProcess::i_setProcessStatus(ProcessStatus_T procStatus, int vrcProc)
 {
     LogFlowThisFuncEnter();
@@ -1091 +1090 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    LogFlowThisFunc(("oldStatus=%RU32, newStatus=%RU32, procRc=%Rrc\n",
-                     mData.mStatus, procStatus, procRc));
+    LogFlowThisFunc(("oldStatus=%RU32, newStatus=%RU32, vrcProc=%Rrc\n", mData.mStatus, procStatus, vrcProc));
 
     if (procStatus == ProcessStatus_Error)
     {
-        AssertMsg(RT_FAILURE(procRc), ("Guest rc must be an error (%Rrc)\n", procRc));
+        AssertMsg(RT_FAILURE(vrcProc), ("Guest vrcProc must be an error (%Rrc)\n", vrcProc));
         /* Do not allow overwriting an already set error. If this happens
          * this means we forgot some error checking/locking somewhere. */
-        AssertMsg(RT_SUCCESS(mData.mLastError), ("Guest rc already set (to %Rrc)\n", mData.mLastError));
+        AssertMsg(RT_SUCCESS(mData.mLastError), ("Guest vrcProc already set (to %Rrc)\n", mData.mLastError));
     }
     else
-        AssertMsg(RT_SUCCESS(procRc), ("Guest rc must not be an error (%Rrc)\n", procRc));
+        AssertMsg(RT_SUCCESS(vrcProc), ("Guest vrcProc must not be an error (%Rrc)\n", vrcProc));
 
     int vrc = VINF_SUCCESS;
@@ -1109 +1107 @@
     {
         mData.mStatus    = procStatus;
-        mData.mLastError = procRc;
+        mData.mLastError = vrcProc;
 
         ComObjPtr<VirtualBoxErrorInfo> errorInfo;
@@ -1153 +1151 @@
  * @returns VBox status code.
  * @param   cMsTimeout          Timeout (in ms) to wait for starting the process.
- * @param   prcGuest            Where to return the guest error when VERR_GSTCTL_GUEST_ERROR
- *                              was returned. Optional.
+ * @param   pvrcGuest           Where to return the guest error when
+ *                              VERR_GSTCTL_GUEST_ERROR was returned. Optional.
  *
  * @note    Takes the write lock.
  */
-int GuestProcess::i_startProcess(uint32_t cMsTimeout, int *prcGuest)
+int GuestProcess::i_startProcess(uint32_t cMsTimeout, int *pvrcGuest)
 {
     LogFlowThisFunc(("cMsTimeout=%RU32, procExe=%s, procTimeoutMS=%RU32, procFlags=%x, sessionID=%RU32\n",
@@ -1186 +1184 @@
         return vrc;
 
-    vrc = i_startProcessInner(cMsTimeout, alock, pEvent, prcGuest);
+    vrc = i_startProcessInner(cMsTimeout, alock, pEvent, pvrcGuest);
 
     unregisterWaitEvent(pEvent);
@@ -1201 +1199 @@
  * @param   rLock               Write lock to use for serialization.
  * @param   pEvent              Event to use for notifying waiters.
- * @param   prcGuest            Where to return the guest error when VERR_GSTCTL_GUEST_ERROR
- *                              was returned. Optional.
- */
-int GuestProcess::i_startProcessInner(uint32_t cMsTimeout, AutoWriteLock &rLock, GuestWaitEvent *pEvent, int *prcGuest)
+ * @param   pvrcGuest           Where to return the guest error when
+ *                              VERR_GSTCTL_GUEST_ERROR was returned. Optional.
+ */
+int GuestProcess::i_startProcessInner(uint32_t cMsTimeout, AutoWriteLock &rLock, GuestWaitEvent *pEvent, int *pvrcGuest)
 {
     GuestSession *pSession = mSession;
@@ -1318 +1316 @@
 
     if (RT_SUCCESS(vrc))
-        vrc = i_waitForStatusChange(pEvent, cMsTimeout,
-                                    NULL /* Process status */, prcGuest);
+        vrc = i_waitForStatusChange(pEvent, cMsTimeout, NULL /* Process status */, pvrcGuest);
     return vrc;
 }
@@ -1373 +1370 @@
         return VERR_COM_UNEXPECTED;
 
-    int vrc = pProcess->i_startProcess(30 * 1000 /* 30s timeout */, NULL /* Guest rc, ignored */);
+    int vrc = pProcess->i_startProcess(30 * 1000 /* 30s timeout */, NULL /* pvrcGuest, ignored */);
     /* Nothing to do here anymore. */
 
@@ -1387 +1384 @@
  * @retval  VERR_NOT_SUPPORTED if process termination is not supported on the guest.
  * @param   uTimeoutMS          Timeout (in ms) to wait for process termination.
- * @param   prcGuest            Where to return the guest error when VERR_GSTCTL_GUEST_ERROR
- *                              was returned. Optional.
+ * @param   pvrcGuest           Where to return the guest error when
+ *                              VERR_GSTCTL_GUEST_ERROR was returned. Optional.
  *
  * @note    Takes the write lock.
  */
-int GuestProcess::i_terminateProcess(uint32_t uTimeoutMS, int *prcGuest)
-{
-    /* prcGuest is optional. */
+int GuestProcess::i_terminateProcess(uint32_t uTimeoutMS, int *pvrcGuest)
+{
     LogFlowThisFunc(("uTimeoutMS=%RU32\n", uTimeoutMS));
 
@@ -1443 +1439 @@
             if (RT_SUCCESS(vrc))
                 vrc = i_waitForStatusChange(pEvent, uTimeoutMS,
-                                            NULL /* ProcessStatus */, prcGuest);
+                                            NULL /* ProcessStatus */, pvrcGuest);
             unregisterWaitEvent(pEvent);
         }
@@ -1591 +1587 @@
  * @param   uTimeoutMS          Timeout (in ms) to wait.
  * @param   waitResult          Where to return the process wait result on success.
- * @param   prcGuest            Where to return the guest error when VERR_GSTCTL_GUEST_ERROR
- *                              was returned. Optional.
+ * @param   pvrcGuest           Where to return the guest error when
+ *                              VERR_GSTCTL_GUEST_ERROR was returned. Optional.
  * @note    Takes the read lock.
  */
-int GuestProcess::i_waitFor(uint32_t fWaitFlags, ULONG uTimeoutMS,
-                            ProcessWaitResult_T &waitResult, int *prcGuest)
+int GuestProcess::i_waitFor(uint32_t fWaitFlags, ULONG uTimeoutMS, ProcessWaitResult_T &waitResult, int *pvrcGuest)
 {
     AssertReturn(fWaitFlags, VERR_INVALID_PARAMETER);
@@ -1602 +1597 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    LogFlowThisFunc(("fWaitFlags=0x%x, uTimeoutMS=%RU32, procStatus=%RU32, procRc=%Rrc, prcGuest=%p\n",
-                     fWaitFlags, uTimeoutMS, mData.mStatus, mData.mLastError, prcGuest));
+    LogFlowThisFunc(("fWaitFlags=0x%x, uTimeoutMS=%RU32, procStatus=%RU32, vrcProc=%Rrc, pvrcGuest=%p\n",
+                     fWaitFlags, uTimeoutMS, mData.mStatus, mData.mLastError, pvrcGuest));
 
     /* Did some error occur before? Then skip waiting and return. */
@@ -1611 +1606 @@
         waitResult = ProcessWaitResult_Error;
         AssertMsg(RT_FAILURE(mData.mLastError),
-                             ("No error rc (%Rrc) set when guest process indicated an error\n", mData.mLastError));
-        if (prcGuest)
-            *prcGuest = mData.mLastError; /* Return last set error. */
-        LogFlowThisFunc(("Process is in error state (rcGuest=%Rrc)\n", mData.mLastError));
+                             ("No error vrc (%Rrc) set when guest process indicated an error\n", mData.mLastError));
+        if (pvrcGuest)
+            *pvrcGuest = mData.mLastError; /* Return last set error. */
+        LogFlowThisFunc(("Process is in error state (vrcGuest=%Rrc)\n", mData.mLastError));
         return VERR_GSTCTL_GUEST_ERROR;
     }
@@ -1623 +1618 @@
     if (waitResult != ProcessWaitResult_None)
     {
-        if (prcGuest)
-            *prcGuest = mData.mLastError; /* Return last set error (if any). */
-        LogFlowThisFunc(("Nothing to wait for (rcGuest=%Rrc)\n", mData.mLastError));
+        if (pvrcGuest)
+            *pvrcGuest = mData.mLastError; /* Return last set error (if any). */
+        LogFlowThisFunc(("Nothing to wait for (vrcGuest=%Rrc)\n", mData.mLastError));
         return RT_SUCCESS(mData.mLastError) ? VINF_SUCCESS : VERR_GSTCTL_GUEST_ERROR;
     }
@@ -1669 +1664 @@
 
         vrc = i_waitForStatusChange(pEvent,
-                                    uTimeoutMS == RT_INDEFINITE_WAIT
-                                    ? RT_INDEFINITE_WAIT : uTimeoutMS - (uint32_t)u64ElapsedMS,
-                                    &newStatus, prcGuest);
+                                    uTimeoutMS == RT_INDEFINITE_WAIT ? RT_INDEFINITE_WAIT : uTimeoutMS - (uint32_t)u64ElapsedMS,
+                                    &newStatus, pvrcGuest);
         if (RT_SUCCESS(vrc))
         {
@@ -1693 +1687 @@
     unregisterWaitEvent(pEvent);
 
-    LogFlowThisFunc(("Returned waitResult=%RU32, newStatus=%RU32, rc=%Rrc\n",
-                     waitResult, newStatus, vrc));
+    LogFlowThisFunc(("Returned waitResult=%RU32, newStatus=%RU32, vrc=%Rrc\n", waitResult, newStatus, vrc));
     return vrc;
 }
@@ -1726 +1719 @@
             if (pInputStatus)
             {
-                HRESULT hr2 = pProcessEvent->COMGETTER(Status)(pInputStatus);
-                ComAssertComRC(hr2);
+                HRESULT hrc2 = pProcessEvent->COMGETTER(Status)(pInputStatus);
+                ComAssertComRC(hrc2);
             }
             if (pcbProcessed)
             {
-                HRESULT hr2 = pProcessEvent->COMGETTER(Processed)((ULONG*)pcbProcessed);
-                ComAssertComRC(hr2);
+                HRESULT hrc2 = pProcessEvent->COMGETTER(Processed)((ULONG*)pcbProcessed);
+                ComAssertComRC(hrc2);
             }
         }
@@ -1739 +1732 @@
     }
 
-    LogFlowThisFunc(("Returning pEvent=%p, uHandle=%RU32, rc=%Rrc\n",
-                     pEvent, uHandle, vrc));
+    LogFlowThisFunc(("Returning pEvent=%p, uHandle=%RU32, vrc=%Rrc\n", pEvent, uHandle, vrc));
     return vrc;
 }
@@ -1782 +1774 @@
 
                 ULONG uHandleEvent;
-                HRESULT hr = pProcessEvent->COMGETTER(Handle)(&uHandleEvent);
-                if (   SUCCEEDED(hr)
+                HRESULT hrc = pProcessEvent->COMGETTER(Handle)(&uHandleEvent);
+                if (   SUCCEEDED(hrc)
                     && uHandleEvent == uHandle)
                 {
@@ -1789 +1781 @@
                     {
                         com::SafeArray <BYTE> data;
-                        hr = pProcessEvent->COMGETTER(Data)(ComSafeArrayAsOutParam(data));
-                        ComAssertComRC(hr);
+                        hrc = pProcessEvent->COMGETTER(Data)(ComSafeArrayAsOutParam(data));
+                        ComAssertComRC(hrc);
                         size_t cbRead = data.size();
                         if (cbRead)
@@ -1802 +1794 @@
                                 vrc = VERR_BUFFER_OVERFLOW;
 
-                            LogFlowThisFunc(("Read %zu bytes (uHandle=%RU32), rc=%Rrc\n",
-                                             cbRead, uHandleEvent, vrc));
+                            LogFlowThisFunc(("Read %zu bytes (uHandle=%RU32), vrc=%Rrc\n", cbRead, uHandleEvent, vrc));
                         }
                     }
@@ -1811 +1802 @@
                     {
                         ULONG cbRead;
-                        hr = pProcessEvent->COMGETTER(Processed)(&cbRead);
-                        ComAssertComRC(hr);
+                        hrc = pProcessEvent->COMGETTER(Processed)(&cbRead);
+                        ComAssertComRC(hrc);
                         *pcbRead = (uint32_t)cbRead;
                     }
@@ -1818 +1809 @@
                     break;
                 }
-                else if (FAILED(hr))
+                else if (FAILED(hrc))
                     vrc = VERR_COM_UNEXPECTED;
             }
@@ -1845 +1836 @@
  * @param   uTimeoutMS          Timeout (in ms) to wait.
  * @param   pProcessStatus      Where to return the process status on success.
- * @param   prcGuest            Where to return the guest error when VERR_GSTCTL_GUEST_ERROR
- *                              was returned.
+ * @param   pvrcGuest           Where to return the guest error when
+ *                              VERR_GSTCTL_GUEST_ERROR was returned.
  */
 int GuestProcess::i_waitForStatusChange(GuestWaitEvent *pEvent, uint32_t uTimeoutMS,
-                                        ProcessStatus_T *pProcessStatus, int *prcGuest)
+                                        ProcessStatus_T *pProcessStatus, int *pvrcGuest)
 {
     AssertPtrReturn(pEvent, VERR_INVALID_POINTER);
     /* pProcessStatus is optional. */
-    /* prcGuest is optional. */
+    /* pvrcGuest is optional. */
 
     VBoxEventType_T evtType;
@@ -1866 +1857 @@
 
         ProcessStatus_T procStatus;
-        HRESULT hr = pProcessEvent->COMGETTER(Status)(&procStatus);
-        ComAssertComRC(hr);
+        HRESULT hrc = pProcessEvent->COMGETTER(Status)(&procStatus);
+        ComAssertComRC(hrc);
         if (pProcessStatus)
             *pProcessStatus = procStatus;
 
         ComPtr<IVirtualBoxErrorInfo> errorInfo;
-        hr = pProcessEvent->COMGETTER(Error)(errorInfo.asOutParam());
-        ComAssertComRC(hr);
+        hrc = pProcessEvent->COMGETTER(Error)(errorInfo.asOutParam());
+        ComAssertComRC(hrc);
 
         LONG lGuestRc;
-        hr = errorInfo->COMGETTER(ResultDetail)(&lGuestRc);
-        ComAssertComRC(hr);
-
-        LogFlowThisFunc(("Got procStatus=%RU32, rcGuest=%RI32 (%Rrc)\n",
-                         procStatus, lGuestRc, lGuestRc));
+        hrc = errorInfo->COMGETTER(ResultDetail)(&lGuestRc);
+        ComAssertComRC(hrc);
+
+        LogFlowThisFunc(("Got procStatus=%RU32, vrcGuest=%RI32 (%Rrc)\n", procStatus, lGuestRc, lGuestRc));
 
         if (RT_FAILURE((int)lGuestRc))
             vrc = VERR_GSTCTL_GUEST_ERROR;
 
-        if (prcGuest)
-            *prcGuest = (int)lGuestRc;
-    }
-    /* waitForEvent may also return VERR_GSTCTL_GUEST_ERROR like we do above, so make prcGuest is set. */
-    else if (vrc == VERR_GSTCTL_GUEST_ERROR && prcGuest)
-        *prcGuest = pEvent->GuestResult();
-    Assert(vrc != VERR_GSTCTL_GUEST_ERROR || !prcGuest || *prcGuest != (int)0xcccccccc);
+        if (pvrcGuest)
+            *pvrcGuest = (int)lGuestRc;
+    }
+    /* waitForEvent may also return VERR_GSTCTL_GUEST_ERROR like we do above, so make pvrcGuest is set. */
+    else if (vrc == VERR_GSTCTL_GUEST_ERROR && pvrcGuest)
+        *pvrcGuest = pEvent->GuestResult();
+    Assert(vrc != VERR_GSTCTL_GUEST_ERROR || !pvrcGuest || *pvrcGuest != (int)0xcccccccc);
 
     LogFlowFuncLeaveRC(vrc);
@@ -1941 +1931 @@
  * @param   uTimeoutMS          Timeout (in ms) to wait.
  * @param   puWritten           Where to return the size (in bytes) written. Optional.
- * @param   prcGuest            Where to return the guest error when VERR_GSTCTL_GUEST_ERROR
- *                              was returned. Optional.
+ * @param   pvrcGuest           Where to return the guest error when
+ *                              VERR_GSTCTL_GUEST_ERROR was returned. Optional.
  *
  * @note    Takes the write lock.
  */
 int GuestProcess::i_writeData(uint32_t uHandle, uint32_t uFlags,
-                              void *pvData, size_t cbData, uint32_t uTimeoutMS, uint32_t *puWritten, int *prcGuest)
-{
-    LogFlowThisFunc(("uPID=%RU32, uHandle=%RU32, uFlags=%RU32, pvData=%p, cbData=%RU32, uTimeoutMS=%RU32, puWritten=%p, prcGuest=%p\n",
-                     mData.mPID, uHandle, uFlags, pvData, cbData, uTimeoutMS, puWritten, prcGuest));
+                              void *pvData, size_t cbData, uint32_t uTimeoutMS, uint32_t *puWritten, int *pvrcGuest)
+{
+    LogFlowThisFunc(("uPID=%RU32, uHandle=%RU32, uFlags=%RU32, pvData=%p, cbData=%RU32, uTimeoutMS=%RU32, puWritten=%p, pvrcGuest=%p\n",
+                     mData.mPID, uHandle, uFlags, pvData, cbData, uTimeoutMS, puWritten, pvrcGuest));
     /* All is optional. There can be 0 byte writes. */
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -1958 +1948 @@
         if (puWritten)
             *puWritten = 0;
-        if (prcGuest)
-            *prcGuest = VINF_SUCCESS;
+        if (pvrcGuest)
+            *pvrcGuest = VINF_SUCCESS;
         return VINF_SUCCESS; /* Not available for writing (anymore). */
     }
@@ -2009 +1999 @@
         if (RT_SUCCESS(vrc))
         {
-            /** @todo Set rcGuest. */
+            /** @todo Set vrcGuest. */
 
             if (puWritten)
@@ -2019 +2009 @@
     unregisterWaitEvent(pEvent);
 
-    LogFlowThisFunc(("Returning cbProcessed=%RU32, rc=%Rrc\n",
-                     cbProcessed, vrc));
+    LogFlowThisFunc(("Returning cbProcessed=%RU32, vrc=%Rrc\n", cbProcessed, vrc));
     return vrc;
 }
@@ -2070 +2059 @@
     }
 
-    LogFlowThisFunc(("rc=%Rrc, cbRead=%RU32\n", vrc, cbRead));
-
+    LogFlowThisFunc(("vrc=%Rrc, cbRead=%RU32\n", vrc, cbRead));
     LogFlowFuncLeaveRC(vrc);
     return hrc;
@@ -2243 +2231 @@
     }
 
-    LogFlowThisFunc(("rc=%Rrc, aWritten=%RU32\n", vrc, cbWritten));
+    LogFlowThisFunc(("vrc=%Rrc, aWritten=%RU32\n", vrc, cbWritten));
 
     *aWritten = (ULONG)cbWritten;
@@ -2283 +2271 @@
  * @param   startupInfo         Guest process startup info to use for starting.
  * @param   fAsync              Whether to start asynchronously or not.
- * @param   prcGuest            Where to return the guest error when VERR_GSTCTL_GUEST_ERROR
- *                              was returned. Optional.
+ * @param   pvrcGuest           Where to return the guest error when
+ *                              VERR_GSTCTL_GUEST_ERROR was returned. Optional.
  */
 int GuestProcessTool::init(GuestSession *pGuestSession, const GuestProcessStartupInfo &startupInfo,
-                           bool fAsync, int *prcGuest)
+                           bool fAsync, int *pvrcGuest)
 {
     LogFlowThisFunc(("pGuestSession=%p, exe=%s, fAsync=%RTbool\n",
@@ -2317 +2305 @@
         }
 
-        if (prcGuest)
-            *prcGuest = vrcGuest;
+        if (pvrcGuest)
+            *pvrcGuest = vrcGuest;
     }
 
@@ -2373 +2361 @@
     } while (RT_SUCCESS(vrc));
 
-    LogFlowThisFunc(("rc=%Rrc, %RU64 pairs\n",
-                      vrc, strmBlock.GetCount()));
+    LogFlowThisFunc(("vrc=%Rrc, %RU64 pairs\n", vrc, strmBlock.GetCount()));
     return vrc;
 }
@@ -2386 +2373 @@
 {
     LONG exitCode = -1;
-    HRESULT hr = pProcess->COMGETTER(ExitCode(&exitCode));
-    AssertComRC(hr);
+    HRESULT hrc = pProcess->COMGETTER(ExitCode(&exitCode));
+    AssertComRC(hrc);
 
     return GuestProcessTool::exitCodeToRc(mStartupInfo, exitCode);
@@ -2402 +2389 @@
 
     ProcessStatus_T procStatus = ProcessStatus_Undefined;
-    HRESULT hr = pProcess->COMGETTER(Status(&procStatus));
-    AssertComRC(hr);
+    HRESULT hrc = pProcess->COMGETTER(Status(&procStatus));
+    AssertComRC(hrc);
 
     if (   procStatus == ProcessStatus_Started
@@ -2452 +2439 @@
     {
         /* Make sure to check the error information we got from the guest tool. */
-        if (GuestProcess::i_isGuestError(errorInfo.rcGuest))
-        {
-            if (errorInfo.rcGuest == VERR_GSTCTL_PROCESS_EXIT_CODE) /* Translate exit code to a meaningful error code. */
+        if (GuestProcess::i_isGuestError(errorInfo.vrcGuest))
+        {
+            if (errorInfo.vrcGuest == VERR_GSTCTL_PROCESS_EXIT_CODE) /* Translate exit code to a meaningful error code. */
                 vrcGuest = GuestProcessTool::exitCodeToRc(startupInfo, errorInfo.iExitCode);
             else /* At least return something. */
-                vrcGuest = errorInfo.rcGuest;
+                vrcGuest = errorInfo.vrcGuest;
 
             if (pvrcGuest)
@@ -2466 +2453 @@
     }
 
-    LogFlowFunc(("Returned vrc=%Rrc, vrcGuest=%Rrc, iExitCode=%d\n", vrc, errorInfo.rcGuest, errorInfo.iExitCode));
+    LogFlowFunc(("Returned vrc=%Rrc, vrcGuest=%Rrc, iExitCode=%d\n", vrc, errorInfo.vrcGuest, errorInfo.iExitCode));
     return vrc;
 }
@@ -2480 +2467 @@
  */
 /* static */
-int GuestProcessTool::runErrorInfo(      GuestSession              *pGuestSession,
-                                   const GuestProcessStartupInfo   &startupInfo,
-                                         GuestProcessToolErrorInfo &errorInfo)
-{
-    return runExErrorInfo(pGuestSession, startupInfo,
-                          NULL /* paStrmOutObjects */, 0 /* cStrmOutObjects */, errorInfo);
+int GuestProcessTool::runErrorInfo(GuestSession                    *pGuestSession,
+                                   GuestProcessStartupInfo const   &startupInfo,
+                                   GuestProcessToolErrorInfo       &errorInfo)
+{
+    return runExErrorInfo(pGuestSession, startupInfo, NULL /* paStrmOutObjects */, 0 /* cStrmOutObjects */, errorInfo);
 }
 
@@ -2500 +2486 @@
  */
 /* static */
-int GuestProcessTool::runEx(      GuestSession              *pGuestSession,
-                            const GuestProcessStartupInfo   &startupInfo,
-                                  GuestCtrlStreamObjects    *paStrmOutObjects,
-                                  uint32_t                   cStrmOutObjects,
-                                  int                       *pvrcGuest /* = NULL */)
+int GuestProcessTool::runEx(GuestSession                   *pGuestSession,
+                            GuestProcessStartupInfo const  &startupInfo,
+                            GuestCtrlStreamObjects         *paStrmOutObjects,
+                            uint32_t                        cStrmOutObjects,
+                            int                            *pvrcGuest /* = NULL */)
 {
     int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
@@ -2513 +2499 @@
     {
         /* Make sure to check the error information we got from the guest tool. */
-        if (GuestProcess::i_isGuestError(errorInfo.rcGuest))
-        {
-            if (errorInfo.rcGuest == VERR_GSTCTL_PROCESS_EXIT_CODE) /* Translate exit code to a meaningful error code. */
+        if (GuestProcess::i_isGuestError(errorInfo.vrcGuest))
+        {
+            if (errorInfo.vrcGuest == VERR_GSTCTL_PROCESS_EXIT_CODE) /* Translate exit code to a meaningful error code. */
                 vrcGuest = GuestProcessTool::exitCodeToRc(startupInfo, errorInfo.iExitCode);
             else /* At least return something. */
-                vrcGuest = errorInfo.rcGuest;
+                vrcGuest = errorInfo.vrcGuest;
 
             if (pvrcGuest)
@@ -2527 +2513 @@
     }
 
-    LogFlowFunc(("Returned vrc=%Rrc, vrcGuest=%Rrc, iExitCode=%d\n", vrc, errorInfo.rcGuest, errorInfo.iExitCode));
+    LogFlowFunc(("Returned vrc=%Rrc, vrcGuest=%Rrc, iExitCode=%d\n", vrc, errorInfo.vrcGuest, errorInfo.iExitCode));
     return vrc;
 }
@@ -2547 +2533 @@
  */
 /* static */
-int GuestProcessTool::runExErrorInfo(      GuestSession              *pGuestSession,
-                                     const GuestProcessStartupInfo   &startupInfo,
-                                           GuestCtrlStreamObjects    *paStrmOutObjects,
-                                           uint32_t                   cStrmOutObjects,
-                                           GuestProcessToolErrorInfo &errorInfo)
+int GuestProcessTool::runExErrorInfo(GuestSession                  *pGuestSession,
+                                     GuestProcessStartupInfo const &startupInfo,
+                                     GuestCtrlStreamObjects        *paStrmOutObjects,
+                                     uint32_t                       cStrmOutObjects,
+                                     GuestProcessToolErrorInfo     &errorInfo)
 {
     AssertPtrReturn(pGuestSession, VERR_INVALID_POINTER);
@@ -2559 +2545 @@
 
     GuestProcessTool procTool;
-    int vrc = procTool.init(pGuestSession, startupInfo, false /* Async */, &errorInfo.rcGuest);
+    int vrc = procTool.init(pGuestSession, startupInfo, false /* Async */, &errorInfo.vrcGuest);
     if (RT_SUCCESS(vrc))
     {
@@ -2569 +2555 @@
                 vrc = procTool.waitEx(  paStrmOutObjects
                                         ? GUESTPROCESSTOOL_WAIT_FLAG_STDOUT_BLOCK
-                                        : GUESTPROCESSTOOL_WAIT_FLAG_NONE, &strmBlk, &errorInfo.rcGuest);
+                                        : GUESTPROCESSTOOL_WAIT_FLAG_NONE, &strmBlk, &errorInfo.vrcGuest);
                 if (paStrmOutObjects)
                     paStrmOutObjects->push_back(strmBlk);
@@ -2586 +2572 @@
     {
         /* Make sure the process runs until completion. */
-        vrc = procTool.wait(GUESTPROCESSTOOL_WAIT_FLAG_NONE, &errorInfo.rcGuest);
+        vrc = procTool.wait(GUESTPROCESSTOOL_WAIT_FLAG_NONE, &errorInfo.vrcGuest);
         if (RT_SUCCESS(vrc))
-            errorInfo.rcGuest = procTool.getTerminationStatus(&errorInfo.iExitCode);
-    }
-
-    LogFlowFunc(("Returned rc=%Rrc, rcGuest=%Rrc, iExitCode=%d\n", vrc, errorInfo.rcGuest, errorInfo.iExitCode));
+            errorInfo.vrcGuest = procTool.getTerminationStatus(&errorInfo.iExitCode);
+    }
+
+    LogFlowFunc(("Returned vrc=%Rrc, vrcGuest=%Rrc, iExitCode=%d\n", vrc, errorInfo.vrcGuest, errorInfo.iExitCode));
     return vrc;
 }
@@ -2613 +2599 @@
     {
         LONG iExitCode = -1;
-        HRESULT hr = pProcess->COMGETTER(ExitCode(&iExitCode));
-        AssertComRC(hr);
+        HRESULT hrc = pProcess->COMGETTER(ExitCode(&iExitCode));
+        AssertComRC(hrc);
 
         if (piExitCode)
@@ -2633 +2619 @@
  * @returns VBox status code.
  * @param   fToolWaitFlags      Guest process tool wait flags to use for waiting.
- * @param   prcGuest            Where to return the guest error when VERR_GSTCTL_GUEST_ERROR
- *                              was returned. Optional.
- */
-int GuestProcessTool::wait(uint32_t fToolWaitFlags, int *prcGuest)
-{
-    return waitEx(fToolWaitFlags, NULL /* pStrmBlkOut */, prcGuest);
+ * @param   pvrcGuest           Where to return the guest error when
+ *                              VERR_GSTCTL_GUEST_ERROR was returned. Optional.
+ */
+int GuestProcessTool::wait(uint32_t fToolWaitFlags, int *pvrcGuest)
+{
+    return waitEx(fToolWaitFlags, NULL /* pStrmBlkOut */, pvrcGuest);
 }
 
@@ -2647 +2633 @@
  * @param   fToolWaitFlags      Guest process tool wait flags to use for waiting.
  * @param   pStrmBlkOut         Where to store the guest process output.
- * @param   prcGuest            Where to return the guest error when VERR_GSTCTL_GUEST_ERROR
- *                              was returned. Optional.
- */
-int GuestProcessTool::waitEx(uint32_t fToolWaitFlags, GuestProcessStreamBlock *pStrmBlkOut, int *prcGuest)
-{
-    LogFlowThisFunc(("fToolWaitFlags=0x%x, pStreamBlock=%p, prcGuest=%p\n", fToolWaitFlags, pStrmBlkOut, prcGuest));
+ * @param   pvrcGuest           Where to return the guest error when
+ *                              VERR_GSTCTL_GUEST_ERROR was returned. Optional.
+ */
+int GuestProcessTool::waitEx(uint32_t fToolWaitFlags, GuestProcessStreamBlock *pStrmBlkOut, int *pvrcGuest)
+{
+    LogFlowThisFunc(("fToolWaitFlags=0x%x, pStreamBlock=%p, pvrcGuest=%p\n", fToolWaitFlags, pStrmBlkOut, pvrcGuest));
 
     /* Can we parse the next block without waiting? */
@@ -2736 +2722 @@
                 /* Since waiting for stdout / stderr is not supported by the guest,
                  * wait a bit to not hog the CPU too much when polling for data. */
-                RTThreadSleep(1); /* Optional, don't check rc. */
+                RTThreadSleep(1); /* Optional, don't check vrc. */
                 break;
 
@@ -2828 +2814 @@
         vrc = VERR_GSTCTL_GUEST_ERROR;
 
-    LogFlowThisFunc(("Loop ended with rc=%Rrc, vrcGuest=%Rrc, waitRes=%RU32\n",
-                     vrc, vrcGuest, waitRes));
-    if (prcGuest)
-        *prcGuest = vrcGuest;
+    LogFlowThisFunc(("Loop ended with vrc=%Rrc, vrcGuest=%Rrc, waitRes=%RU32\n", vrc, vrcGuest, waitRes));
+    if (pvrcGuest)
+        *pvrcGuest = vrcGuest;
 
     LogFlowFuncLeaveRC(vrc);
@@ -2842 +2827 @@
  * @returns VBox status code.
  * @param   uTimeoutMS          Timeout (in ms) to wait.
- * @param   prcGuest            Where to return the guest error when VERR_GSTCTL_GUEST_ERROR
- *                              was returned. Optional.
- */
-int GuestProcessTool::terminate(uint32_t uTimeoutMS, int *prcGuest)
+ * @param   pvrcGuest           Where to return the guest error when
+ *                              VERR_GSTCTL_GUEST_ERROR was returned. Optional.
+ */
+int GuestProcessTool::terminate(uint32_t uTimeoutMS, int *pvrcGuest)
 {
     LogFlowThisFuncEnter();
@@ -2851 +2836 @@
     int vrc;
     if (!pProcess.isNull())
-        vrc = pProcess->i_terminateProcess(uTimeoutMS, prcGuest);
+        vrc = pProcess->i_terminateProcess(uTimeoutMS, pvrcGuest);
     else
         vrc = VERR_NOT_FOUND;
@@ -2973 +2958 @@
 
     /** @todo pData->u32Flags: int vs. uint32 -- IPRT errors are *negative* !!! */
-    switch (guestErrorInfo.getRc())
+    switch (guestErrorInfo.getVrc())
     {
         case VERR_ACCESS_DENIED:
@@ -3023 +3008 @@
         default:
             strErr.printf(tr("Unhandled error %Rrc for \"%s\" occurred for tool \"%s\" on guest -- please file a bug report"),
-                          guestErrorInfo.getRc(), guestErrorInfo.getWhat().c_str(), pszTool);
+                          guestErrorInfo.getVrc(), guestErrorInfo.getWhat().c_str(), pszTool);
             break;
     }

trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp

@@ -108 +108 @@
     void handler()
     {
-        /* Ignore rc */ GuestSession::i_startSessionThreadTask(this);
+        /* Ignore return code */
+        GuestSession::i_startSessionThreadTask(this);
     }
 };
@@ -147 +148 @@
             {
                 AssertPtrReturn(mSession, E_POINTER);
-                int rc2 = mSession->signalWaitEvent(aType, aEvent);
-                RT_NOREF(rc2);
+                int vrc2 = mSession->signalWaitEvent(aType, aEvent);
+                RT_NOREF(vrc2);
 #ifdef DEBUG_andy
-                LogFlowFunc(("Signalling events of type=%RU32, session=%p resulted in rc=%Rrc\n",
-                             aType, mSession, rc2));
+                LogFlowFunc(("Signalling events of type=%RU32, session=%p resulted in vrc2=%Rrc\n", aType, mSession, vrc2));
 #endif
                 break;
@@ -245 +245 @@
      * objects (like files, directories, ...) which are bound to this session.
      */
-    int rc = i_objectRegister(NULL /* pObject */, SESSIONOBJECTTYPE_SESSION, &mData.mObjectID);
-    if (RT_SUCCESS(rc))
-    {
-        rc = mData.mEnvironmentChanges.initChangeRecord(pGuest->i_isGuestInWindowsNtFamily()
-                                                        ? RTENV_CREATE_F_ALLOW_EQUAL_FIRST_IN_VAR : 0);
-        if (RT_SUCCESS(rc))
-        {
-            rc = RTCritSectInit(&mWaitEventCritSect);
-            AssertRC(rc);
-        }
-    }
-
-    if (RT_SUCCESS(rc))
-        rc = i_determineProtocolVersion();
-
-    if (RT_SUCCESS(rc))
+    int vrc = i_objectRegister(NULL /* pObject */, SESSIONOBJECTTYPE_SESSION, &mData.mObjectID);
+    if (RT_SUCCESS(vrc))
+    {
+        vrc = mData.mEnvironmentChanges.initChangeRecord(pGuest->i_isGuestInWindowsNtFamily()
+                                                         ? RTENV_CREATE_F_ALLOW_EQUAL_FIRST_IN_VAR : 0);
+        if (RT_SUCCESS(vrc))
+        {
+            vrc = RTCritSectInit(&mWaitEventCritSect);
+            AssertRC(vrc);
+        }
+    }
+
+    if (RT_SUCCESS(vrc))
+        vrc = i_determineProtocolVersion();
+
+    if (RT_SUCCESS(vrc))
     {
         /*
          * <Replace this if you figure out what the code is doing.>
          */
-        HRESULT hr = unconst(mEventSource).createObject();
-        if (SUCCEEDED(hr))
-            hr = mEventSource->init();
-        if (SUCCEEDED(hr))
+        HRESULT hrc = unconst(mEventSource).createObject();
+        if (SUCCEEDED(hrc))
+            hrc = mEventSource->init();
+        if (SUCCEEDED(hrc))
         {
             try
@@ -274 +274 @@
                 GuestSessionListener *pListener = new GuestSessionListener();
                 ComObjPtr<GuestSessionListenerImpl> thisListener;
-                hr = thisListener.createObject();
-                if (SUCCEEDED(hr))
-                    hr = thisListener->init(pListener, this); /* thisListener takes ownership of pListener. */
-                if (SUCCEEDED(hr))
+                hrc = thisListener.createObject();
+                if (SUCCEEDED(hrc))
+                    hrc = thisListener->init(pListener, this); /* thisListener takes ownership of pListener. */
+                if (SUCCEEDED(hrc))
                 {
                     com::SafeArray <VBoxEventType_T> eventTypes;
                     eventTypes.push_back(VBoxEventType_OnGuestSessionStateChanged);
-                    hr = mEventSource->RegisterListener(thisListener,
-                                                        ComSafeArrayAsInParam(eventTypes),
-                                                        TRUE /* Active listener */);
-                    if (SUCCEEDED(hr))
+                    hrc = mEventSource->RegisterListener(thisListener,
+                                                         ComSafeArrayAsInParam(eventTypes),
+                                                         TRUE /* Active listener */);
+                    if (SUCCEEDED(hrc))
                     {
                         mLocalListener = thisListener;
@@ -292 +292 @@
                          */
                         autoInitSpan.setSucceeded();
-                        LogFlowThisFunc(("mName=%s mID=%RU32 mIsInternal=%RTbool rc=VINF_SUCCESS\n",
+                        LogFlowThisFunc(("mName=%s mID=%RU32 mIsInternal=%RTbool vrc=VINF_SUCCESS\n",
                                          mData.mSession.mName.c_str(), mData.mSession.mID, mData.mSession.mIsInternal));
                         return VINF_SUCCESS;
@@ -300 +300 @@
             catch (std::bad_alloc &)
             {
-                hr = E_OUTOFMEMORY;
+                hrc = E_OUTOFMEMORY;
             }
         }
-        rc = Global::vboxStatusCodeFromCOM(hr);
+        vrc = Global::vboxStatusCodeFromCOM(hrc);
     }
 
     autoInitSpan.setFailed();
-    LogThisFunc(("Failed! mName=%s mID=%RU32 mIsInternal=%RTbool => rc=%Rrc\n",
-                 mData.mSession.mName.c_str(), mData.mSession.mID, mData.mSession.mIsInternal, rc));
-    return rc;
+    LogThisFunc(("Failed! mName=%s mID=%RU32 mIsInternal=%RTbool => vrc=%Rrc\n",
+                 mData.mSession.mName.c_str(), mData.mSession.mID, mData.mSession.mIsInternal, vrc));
+    return vrc;
 }
 
@@ -546 +546 @@
 HRESULT GuestSession::getUserHome(com::Utf8Str &aUserHome)
 {
-    HRESULT hr = i_isStartedExternal();
-    if (FAILED(hr))
-        return hr;
-
-    int rcGuest = VERR_IPE_UNINITIALIZED_STATUS;
-    int vrc = i_pathUserHome(aUserHome, &rcGuest);
+    HRESULT hrc = i_isStartedExternal();
+    if (FAILED(hrc))
+        return hrc;
+
+    int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
+    int vrc = i_pathUserHome(aUserHome, &vrcGuest);
     if (RT_FAILURE(vrc))
     {
@@ -558 +558 @@
             case VERR_GSTCTL_GUEST_ERROR:
             {
-                switch (rcGuest)
+                switch (vrcGuest)
                 {
                     case VERR_NOT_SUPPORTED:
-                        hr = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest,
+                        hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrcGuest,
                                           tr("Getting the user's home path is not supported by installed Guest Additions"));
                         break;
 
                     default:
-                        hr = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest,
-                                          tr("Getting the user's home path failed on the guest: %Rrc"), rcGuest);
+                        hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrcGuest,
+                                          tr("Getting the user's home path failed on the guest: %Rrc"), vrcGuest);
                         break;
                 }
@@ -574 +574 @@
 
             default:
-                hr = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Getting the user's home path failed: %Rrc"), vrc);
+                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Getting the user's home path failed: %Rrc"), vrc);
                 break;
         }
     }
 
-    return hr;
+    return hrc;
 }
 
 HRESULT GuestSession::getUserDocuments(com::Utf8Str &aUserDocuments)
 {
-    HRESULT hr = i_isStartedExternal();
-    if (FAILED(hr))
-        return hr;
-
-    int rcGuest = VERR_IPE_UNINITIALIZED_STATUS;
-    int vrc = i_pathUserDocuments(aUserDocuments, &rcGuest);
+    HRESULT hrc = i_isStartedExternal();
+    if (FAILED(hrc))
+        return hrc;
+
+    int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
+    int vrc = i_pathUserDocuments(aUserDocuments, &vrcGuest);
     if (RT_FAILURE(vrc))
     {
@@ -596 +596 @@
             case VERR_GSTCTL_GUEST_ERROR:
             {
-                switch (rcGuest)
+                switch (vrcGuest)
                 {
                     case VERR_NOT_SUPPORTED:
-                        hr = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest,
+                        hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrcGuest,
                                           tr("Getting the user's documents path is not supported by installed Guest Additions"));
                         break;
 
                     default:
-                        hr = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest,
-                                          tr("Getting the user's documents path failed on the guest: %Rrc"), rcGuest);
+                        hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrcGuest,
+                                          tr("Getting the user's documents path failed on the guest: %Rrc"), vrcGuest);
                         break;
                 }
@@ -612 +612 @@
 
             default:
-                hr = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Getting the user's documents path failed: %Rrc"), vrc);
+                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrc, tr("Getting the user's documents path failed: %Rrc"), vrc);
                 break;
         }
     }
 
-    return hr;
+    return hrc;
 }
 
@@ -673 +673 @@
  * @param   uFlags              Guest session close flags.
  * @param   uTimeoutMS          Timeout (in ms) to wait.
- * @param   prcGuest            Where to return the guest error when VERR_GSTCTL_GUEST_ERROR
- *                              was returned. Optional.
+ * @param   pvrcGuest           Where to return the guest error when
+ *                              VERR_GSTCTL_GUEST_ERROR was returned. Optional.
  *
  * @note    Takes the read lock.
  */
-int GuestSession::i_closeSession(uint32_t uFlags, uint32_t uTimeoutMS, int *prcGuest)
-{
-    AssertPtrReturn(prcGuest, VERR_INVALID_POINTER);
+int GuestSession::i_closeSession(uint32_t uFlags, uint32_t uTimeoutMS, int *pvrcGuest)
+{
+    AssertPtrReturn(pvrcGuest, VERR_INVALID_POINTER);
 
     LogFlowThisFunc(("uFlags=%x, uTimeoutMS=%RU32\n", uFlags, uTimeoutMS));
@@ -734 +734 @@
     if (RT_SUCCESS(vrc))
         vrc = i_waitForStatusChange(pEvent, GuestSessionWaitForFlag_Terminate, uTimeoutMS,
-                                    NULL /* Session status */, prcGuest);
+                                    NULL /* Session status */, pvrcGuest);
 
     unregisterWaitEvent(pEvent);
@@ -941 +941 @@
  * @param   uMode               Creation mode to use (octal, 0777 max).
  * @param   uFlags              Directory creation flags to use.
- * @param   prcGuest            Where to return the guest error when VERR_GSTCTL_GUEST_ERROR
- *                              was returned. Optional.
- */
-int GuestSession::i_directoryCreate(const Utf8Str &strPath, uint32_t uMode,
-                                    uint32_t uFlags, int *prcGuest)
-{
-    AssertPtrReturn(prcGuest, VERR_INVALID_POINTER);
+ * @param   pvrcGuest           Where to return the guest error when
+ *                              VERR_GSTCTL_GUEST_ERROR was returned. Optional.
+ */
+int GuestSession::i_directoryCreate(const Utf8Str &strPath, uint32_t uMode, uint32_t uFlags, int *pvrcGuest)
+{
+    AssertPtrReturn(pvrcGuest, VERR_INVALID_POINTER);
 
     LogFlowThisFunc(("strPath=%s, uMode=%x, uFlags=%x\n", strPath.c_str(), uMode, uFlags));
@@ -993 +992 @@
 
     if (RT_SUCCESS(vrc))
-        vrc = GuestProcessTool::run(this, procInfo, prcGuest);
+        vrc = GuestProcessTool::run(this, procInfo, pvrcGuest);
 
     LogFlowFuncLeaveRC(vrc);
@@ -1008 +1007 @@
 {
     GuestFsObjData objDataIgnored;
-    int rcGuestIgnored;
-    int rc = i_directoryQueryInfo(strPath, true /* fFollowSymlinks */, objDataIgnored, &rcGuestIgnored);
-
-    return RT_SUCCESS(rc);
+    int vrcGuestIgnored;
+    int const vrc = i_directoryQueryInfo(strPath, true /* fFollowSymlinks */, objDataIgnored, &vrcGuestIgnored);
+    return RT_SUCCESS(vrc);
 }
 
@@ -1040 +1038 @@
  * @param   fFollowSymlinks     Whether to follow symlinks or not.
  * @param   objData             Where to store the information returned on success.
- * @param   prcGuest            Guest rc, when returning VERR_GSTCTL_GUEST_ERROR.
- */
-int GuestSession::i_directoryQueryInfo(const Utf8Str &strPath, bool fFollowSymlinks,
-                                       GuestFsObjData &objData, int *prcGuest)
-{
-    AssertPtrReturn(prcGuest, VERR_INVALID_POINTER);
+ * @param   pvrcGuest           Guest VBox status code, when returning
+ *                              VERR_GSTCTL_GUEST_ERROR.
+ */
+int GuestSession::i_directoryQueryInfo(const Utf8Str &strPath, bool fFollowSymlinks, GuestFsObjData &objData, int *pvrcGuest)
+{
+    AssertPtrReturn(pvrcGuest, VERR_INVALID_POINTER);
 
     LogFlowThisFunc(("strPath=%s, fFollowSymlinks=%RTbool\n", strPath.c_str(), fFollowSymlinks));
 
-    int vrc = i_fsQueryInfo(strPath, fFollowSymlinks, objData, prcGuest);
+    int vrc = i_fsQueryInfo(strPath, fFollowSymlinks, objData, pvrcGuest);
     if (RT_SUCCESS(vrc))
     {
@@ -1080 +1078 @@
     LogFlowFunc(("Removing directory (objectID=%RU32) ...\n", idObject));
 
-    int rc = i_objectUnregister(idObject);
-    if (RT_FAILURE(rc))
-        return rc;
+    int vrc = i_objectUnregister(idObject);
+    if (RT_FAILURE(vrc))
+        return vrc;
 
     SessionDirectories::iterator itDirs = mData.mDirectories.find(idObject);
@@ -1093 +1091 @@
                  idObject, mData.mSession.mID, mData.mDirectories.size()));
 
-    rc = pDirConsumed->i_onUnregister();
-    AssertRCReturn(rc, rc);
+    vrc = pDirConsumed->i_onUnregister();
+    AssertRCReturn(vrc, vrc);
 
     mData.mDirectories.erase(itDirs);
@@ -1104 +1102 @@
     pDirConsumed.setNull();
 
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -1114 +1112 @@
  * @param   strPath             Path of directory on guest to remove.
  * @param   fFlags              Directory remove flags to use.
- * @param   prcGuest            Where to return the guest error when VERR_GSTCTL_GUEST_ERROR
- *                              was returned. Optional.
+ * @param   pvrcGuest           Where to return the guest error when
+ *                              VERR_GSTCTL_GUEST_ERROR was returned. Optional.
  *
  * @note    Takes the read lock.
  */
-int GuestSession::i_directoryRemove(const Utf8Str &strPath, uint32_t fFlags, int *prcGuest)
+int GuestSession::i_directoryRemove(const Utf8Str &strPath, uint32_t fFlags, int *pvrcGuest)
 {
     AssertReturn(!(fFlags & ~DIRREMOVEREC_FLAG_VALID_MASK), VERR_INVALID_PARAMETER);
-    AssertPtrReturn(prcGuest, VERR_INVALID_POINTER);
+    AssertPtrReturn(pvrcGuest, VERR_INVALID_POINTER);
 
     LogFlowThisFunc(("strPath=%s, uFlags=0x%x\n", strPath.c_str(), fFlags));
@@ -1148 +1146 @@
         vrc = pEvent->Wait(30 * 1000);
         if (   vrc == VERR_GSTCTL_GUEST_ERROR
-            && prcGuest)
-            *prcGuest = pEvent->GuestResult();
+            && pvrcGuest)
+            *pvrcGuest = pEvent->GuestResult();
     }
 
@@ -1171 +1169 @@
  *                              Ignored when \a fSecure is specified.
  * @param   fSecure             Whether to perform a secure creation or not.
- * @param   prcGuest            Guest rc, when returning VERR_GSTCTL_GUEST_ERROR.
+ * @param   pvrcGuest           Guest VBox status code, when returning
+ *                              VERR_GSTCTL_GUEST_ERROR.
  */
 int GuestSession::i_fsCreateTemp(const Utf8Str &strTemplate, const Utf8Str &strPath, bool fDirectory, Utf8Str &strName,
-                                 uint32_t fMode, bool fSecure, int *prcGuest)
-{
-    AssertPtrReturn(prcGuest, VERR_INVALID_POINTER);
+                                 uint32_t fMode, bool fSecure, int *pvrcGuest)
+{
+    AssertPtrReturn(pvrcGuest, VERR_INVALID_POINTER);
     AssertReturn(fSecure || !(fMode & ~07777), VERR_INVALID_PARAMETER);
 
@@ -1234 +1233 @@
             {
                 vrcGuest = vrc;
-                if (prcGuest)
-                    *prcGuest = vrcGuest;
+                if (pvrcGuest)
+                    *pvrcGuest = vrcGuest;
                 vrc = VERR_GSTCTL_GUEST_ERROR;
             }
@@ -1245 +1244 @@
             strName = objData.mName;
     }
-    else if (prcGuest)
-        *prcGuest = vrcGuest;
+    else if (pvrcGuest)
+        *pvrcGuest = vrcGuest;
 
     LogFlowThisFunc(("Returning vrc=%Rrc, vrcGuest=%Rrc\n", vrc, vrcGuest));
@@ -1259 +1258 @@
  * @param   openInfo            Open information to use.
  * @param   pDirectory          Where to return the guest directory object on success.
- * @param   prcGuest            Where to return the guest error when VERR_GSTCTL_GUEST_ERROR
- *                              was returned. Optional.
+ * @param   pvrcGuest           Where to return the guest error when
+ *                              VERR_GSTCTL_GUEST_ERROR was returned. Optional.
  *
  * @note    Takes the write lock.
  */
-int GuestSession::i_directoryOpen(const GuestDirectoryOpenInfo &openInfo,
-                                  ComObjPtr<GuestDirectory> &pDirectory, int *prcGuest)
-{
-    AssertPtrReturn(prcGuest, VERR_INVALID_POINTER);
-
-    LogFlowThisFunc(("strPath=%s, strPath=%s, uFlags=%x\n",
-                     openInfo.mPath.c_str(), openInfo.mFilter.c_str(), openInfo.mFlags));
+int GuestSession::i_directoryOpen(const GuestDirectoryOpenInfo &openInfo, ComObjPtr<GuestDirectory> &pDirectory, int *pvrcGuest)
+{
+    AssertPtrReturn(pvrcGuest, VERR_INVALID_POINTER);
+
+    LogFlowThisFunc(("strPath=%s, strPath=%s, uFlags=%x\n", openInfo.mPath.c_str(), openInfo.mFilter.c_str(), openInfo.mFlags));
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     /* Create the directory object. */
-    HRESULT hr = pDirectory.createObject();
-    if (FAILED(hr))
-        return Global::vboxStatusCodeFromCOM(hr);
+    HRESULT hrc = pDirectory.createObject();
+    if (FAILED(hrc))
+        return Global::vboxStatusCodeFromCOM(hrc);
 
     /* Register a new object ID. */
@@ -1333 +1330 @@
     {
         /* Nothing further to do here yet. */
-        if (prcGuest)
-            *prcGuest = VINF_SUCCESS;
+        if (pvrcGuest)
+            *pvrcGuest = VINF_SUCCESS;
     }
 
@@ -1362 +1359 @@
      * Find the object.
      */
-    int rc = VERR_NOT_FOUND;
+    int vrc = VERR_NOT_FOUND;
     const uint32_t idObject = VBOX_GUESTCTRL_CONTEXTID_GET_OBJECT(pCtxCb->uContextID);
     SessionObjects::const_iterator itObj = mData.mObjects.find(idObject);
@@ -1378 +1375 @@
                 alock.release();
 
-                rc = i_dispatchToThis(pCtxCb, pSvcCb);
+                vrc = i_dispatchToThis(pCtxCb, pSvcCb);
                 break;
             }
@@ -1388 +1385 @@
                 alock.release();
 
-                rc = pObj->i_callbackDispatcher(pCtxCb, pSvcCb);
+                vrc = pObj->i_callbackDispatcher(pCtxCb, pSvcCb);
                 break;
             }
@@ -1398 +1395 @@
                 alock.release();
 
-                rc = pObj->i_callbackDispatcher(pCtxCb, pSvcCb);
+                vrc = pObj->i_callbackDispatcher(pCtxCb, pSvcCb);
                 break;
             }
@@ -1408 +1405 @@
                 alock.release();
 
-                rc = pObj->i_callbackDispatcher(pCtxCb, pSvcCb);
+                vrc = pObj->i_callbackDispatcher(pCtxCb, pSvcCb);
                 break;
             }
             default:
                 AssertMsgFailed(("%d\n", itObj->second.enmType));
-                rc = VERR_INTERNAL_ERROR_4;
+                vrc = VERR_INTERNAL_ERROR_4;
                 break;
         }
     }
 
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -1438 +1435 @@
     LogFlowThisFunc(("sessionID=%RU32, CID=%RU32, uMessage=%RU32, pSvcCb=%p\n",
                      mData.mSession.mID, pCbCtx->uContextID, pCbCtx->uMessage, pSvcCbData));
-    int rc;
+    int vrc;
     switch (pCbCtx->uMessage)
     {
         case GUEST_MSG_DISCONNECTED:
             /** @todo Handle closing all guest objects. */
-            rc = VERR_INTERNAL_ERROR;
+            vrc = VERR_INTERNAL_ERROR;
             break;
 
         case GUEST_MSG_SESSION_NOTIFY: /* Guest Additions >= 4.3.0. */
-        {
-            rc = i_onSessionStatusChange(pCbCtx, pSvcCbData);
+            vrc = i_onSessionStatusChange(pCbCtx, pSvcCbData);
             break;
-        }
 
         default:
-            rc = dispatchGeneric(pCbCtx, pSvcCbData);
+            vrc = dispatchGeneric(pCbCtx, pSvcCbData);
             break;
     }
 
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -1552 +1547 @@
     LogFlowFunc(("Removing file (objectID=%RU32) ...\n", idObject));
 
-    int rc = i_objectUnregister(idObject);
-    if (RT_FAILURE(rc))
-        return rc;
+    int vrc = i_objectUnregister(idObject);
+    if (RT_FAILURE(vrc))
+        return vrc;
 
     SessionFiles::iterator itFiles = mData.mFiles.find(idObject);
@@ -1565 +1560 @@
                  pFileConsumed->getObjectID(), mData.mSession.mID, mData.mFiles.size()));
 
-    rc = pFileConsumed->i_onUnregister();
-    AssertRCReturn(rc, rc);
+    vrc = pFileConsumed->i_onUnregister();
+    AssertRCReturn(vrc, vrc);
 
     mData.mFiles.erase(itFiles);
@@ -1576 +1571 @@
     pFileConsumed.setNull();
 
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -1586 +1581 @@
  * @returns VERR_GSTCTL_GUEST_ERROR on received guest error.
  * @param   strPath             Path of file on guest to remove.
- * @param   prcGuest            Where to return the guest error when VERR_GSTCTL_GUEST_ERROR
- *                              was returned. Optional.
- */
-int GuestSession::i_fileRemove(const Utf8Str &strPath, int *prcGuest)
+ * @param   pvrcGuest           Where to return the guest error when
+ *                              VERR_GSTCTL_GUEST_ERROR was returned. Optional.
+ */
+int GuestSession::i_fileRemove(const Utf8Str &strPath, int *pvrcGuest)
 {
     LogFlowThisFunc(("strPath=%s\n", strPath.c_str()));
@@ -1623 +1618 @@
             {
                 vrcGuest = vrc;
-                if (prcGuest)
-                    *prcGuest = vrcGuest;
+                if (pvrcGuest)
+                    *pvrcGuest = vrcGuest;
                 vrc = VERR_GSTCTL_GUEST_ERROR;
             }
@@ -1631 +1626 @@
             vrc = VERR_BROKEN_PIPE;
     }
-    else if (prcGuest)
-        *prcGuest = vrcGuest;
+    else if (pvrcGuest)
+        *pvrcGuest = vrcGuest;
 
     LogFlowThisFunc(("Returning vrc=%Rrc, vrcGuest=%Rrc\n", vrc, vrcGuest));
@@ -1650 +1645 @@
  * @param   aFlags              Open flags to use.
  * @param   pFile               Where to return the file object on success.
- * @param   prcGuest            Where to return the guest error when VERR_GSTCTL_GUEST_ERROR
- *                              was returned. Optional.
+ * @param   pvrcGuest           Where to return the guest error when
+ *                              VERR_GSTCTL_GUEST_ERROR was returned. Optional.
  *
  * @note    Takes the write lock.
@@ -1657 +1652 @@
 int GuestSession::i_fileOpenEx(const com::Utf8Str &aPath, FileAccessMode_T aAccessMode, FileOpenAction_T aOpenAction,
                                FileSharingMode_T aSharingMode, ULONG aCreationMode, const std::vector<FileOpenExFlag_T> &aFlags,
-                               ComObjPtr<GuestFile> &pFile, int *prcGuest)
+                               ComObjPtr<GuestFile> &pFile, int *pvrcGuest)
 {
     GuestFileOpenInfo openInfo;
@@ -1671 +1666 @@
     /* Validation is done in i_fileOpen(). */
 
-    return i_fileOpen(openInfo, pFile, prcGuest);
+    return i_fileOpen(openInfo, pFile, pvrcGuest);
 }
 
@@ -1681 +1676 @@
  * @param   openInfo            Open information to use for opening the file.
  * @param   pFile               Where to return the file object on success.
- * @param   prcGuest            Where to return the guest error when VERR_GSTCTL_GUEST_ERROR
- *                              was returned. Optional.
+ * @param   pvrcGuest           Where to return the guest error when
+ *                              VERR_GSTCTL_GUEST_ERROR was returned. Optional.
  *
  * @note    Takes the write lock.
  */
-int GuestSession::i_fileOpen(const GuestFileOpenInfo &openInfo, ComObjPtr<GuestFile> &pFile, int *prcGuest)
+int GuestSession::i_fileOpen(const GuestFileOpenInfo &openInfo, ComObjPtr<GuestFile> &pFile, int *pvrcGuest)
 {
     LogFlowThisFunc(("strFile=%s, enmAccessMode=0x%x, enmOpenAction=0x%x, uCreationMode=%RU32, mfOpenEx=%RU32\n",
@@ -1697 +1692 @@
     if (mData.mProtocolVersion < 2)
     {
-        if (prcGuest)
-            *prcGuest = VERR_NOT_SUPPORTED;
+        if (pvrcGuest)
+            *pvrcGuest = VERR_NOT_SUPPORTED;
         return VERR_GSTCTL_GUEST_ERROR;
     }
@@ -1706 +1701 @@
 
     /* Create the directory object. */
-    HRESULT hr = pFile.createObject();
-    if (FAILED(hr))
+    HRESULT hrc = pFile.createObject();
+    if (FAILED(hrc))
         return VERR_COM_UNEXPECTED;
 
     /* Register a new object ID. */
     uint32_t idObject;
-    int rc = i_objectRegister(pFile, SESSIONOBJECTTYPE_FILE, &idObject);
-    if (RT_FAILURE(rc))
+    int vrc = i_objectRegister(pFile, SESSIONOBJECTTYPE_FILE, &idObject);
+    if (RT_FAILURE(vrc))
     {
         pFile.setNull();
-        return rc;
+        return vrc;
     }
 
@@ -1722 +1717 @@
     AssertPtr(pConsole);
 
-    rc = pFile->init(pConsole, this /* GuestSession */, idObject, openInfo);
-    if (RT_FAILURE(rc))
-        return rc;
+    vrc = pFile->init(pConsole, this /* GuestSession */, idObject, openInfo);
+    if (RT_FAILURE(vrc))
+        return vrc;
 
     /*
@@ -1747 +1742 @@
     catch (std::bad_alloc &)
     {
-        rc = VERR_NO_MEMORY;
-    }
-
-    if (RT_SUCCESS(rc))
-    {
-        int rcGuest = VERR_IPE_UNINITIALIZED_STATUS;
-        rc = pFile->i_openFile(30 * 1000 /* 30s timeout */, &rcGuest);
-        if (   rc == VERR_GSTCTL_GUEST_ERROR
-            && prcGuest)
-        {
-            *prcGuest = rcGuest;
-        }
-    }
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+        vrc = VERR_NO_MEMORY;
+    }
+
+    if (RT_SUCCESS(vrc))
+    {
+        int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
+        vrc = pFile->i_openFile(30 * 1000 /* 30s timeout */, &vrcGuest);
+        if (   vrc == VERR_GSTCTL_GUEST_ERROR
+            && pvrcGuest)
+            *pvrcGuest = vrcGuest;
+    }
+
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -1769 +1762 @@
  *
  * @returns IPRT status code. VERR_NOT_A_FILE if the queried file system object on the guest is not a file,
- *                            or VERR_GSTCTL_GUEST_ERROR if prcGuest contains more error information from the guest.
+ *                            or VERR_GSTCTL_GUEST_ERROR if pvrcGuest contains
+ *                            more error information from the guest.
  * @param   strPath           Absolute path of file to query information for.
  * @param   fFollowSymlinks   Whether or not to follow symbolic links on the guest.
  * @param   objData           Where to store the acquired information.
- * @param   prcGuest          Where to store the guest rc. Optional.
- */
-int GuestSession::i_fileQueryInfo(const Utf8Str &strPath, bool fFollowSymlinks, GuestFsObjData &objData, int *prcGuest)
+ * @param   pvrcGuest         Where to store the guest VBox status code.
+ *                            Optional.
+ */
+int GuestSession::i_fileQueryInfo(const Utf8Str &strPath, bool fFollowSymlinks, GuestFsObjData &objData, int *pvrcGuest)
 {
     LogFlowThisFunc(("strPath=%s fFollowSymlinks=%RTbool\n", strPath.c_str(), fFollowSymlinks));
 
-    int vrc = i_fsQueryInfo(strPath, fFollowSymlinks, objData, prcGuest);
+    int vrc = i_fsQueryInfo(strPath, fFollowSymlinks, objData, pvrcGuest);
     if (RT_SUCCESS(vrc))
-    {
-        vrc = objData.mType == FsObjType_File
-            ? VINF_SUCCESS : VERR_NOT_A_FILE;
-    }
+        vrc = objData.mType == FsObjType_File ? VINF_SUCCESS : VERR_NOT_A_FILE;
 
     LogFlowFuncLeaveRC(vrc);
@@ -1799 +1791 @@
  * @param   fFollowSymlinks     \c true when wanting to follow symbolic links, \c false if not.
  * @param   pllSize             Where to return the queried file size on success.
- * @param   prcGuest            Where to return the guest error when VERR_GSTCTL_GUEST_ERROR
- *                              was returned. Optional.
- */
-int GuestSession::i_fileQuerySize(const Utf8Str &strPath, bool fFollowSymlinks, int64_t *pllSize, int *prcGuest)
+ * @param   pvrcGuest           Where to return the guest error when
+ *                              VERR_GSTCTL_GUEST_ERROR was returned. Optional.
+ */
+int GuestSession::i_fileQuerySize(const Utf8Str &strPath, bool fFollowSymlinks, int64_t *pllSize, int *pvrcGuest)
 {
     AssertPtrReturn(pllSize, VERR_INVALID_POINTER);
 
     GuestFsObjData objData;
-    int vrc = i_fileQueryInfo(strPath, fFollowSymlinks, objData, prcGuest);
+    int vrc = i_fileQueryInfo(strPath, fFollowSymlinks, objData, pvrcGuest);
     if (RT_SUCCESS(vrc))
         *pllSize = objData.mObjectSize;
@@ -1821 +1813 @@
  * @param   fFollowSymlinks     Whether to follow symbolic links or not.
  * @param   objData             Where to return the file system object data, if found.
- * @param   prcGuest            Guest rc, when returning VERR_GSTCTL_GUEST_ERROR.
- *                              Any other return code indicates some host side error.
- */
-int GuestSession::i_fsQueryInfo(const Utf8Str &strPath, bool fFollowSymlinks, GuestFsObjData &objData, int *prcGuest)
+ * @param   pvrcGuest           Guest VBox status code, when returning
+ *                              VERR_GSTCTL_GUEST_ERROR. Any other return code
+ *                              indicates some host side error.
+ */
+int GuestSession::i_fsQueryInfo(const Utf8Str &strPath, bool fFollowSymlinks, GuestFsObjData &objData, int *pvrcGuest)
 {
     LogFlowThisFunc(("strPath=%s\n", strPath.c_str()));
@@ -1860 +1853 @@
             {
                 vrcGuest = vrc;
-                if (prcGuest)
-                    *prcGuest = vrcGuest;
+                if (pvrcGuest)
+                    *pvrcGuest = vrcGuest;
                 vrc = VERR_GSTCTL_GUEST_ERROR;
             }
@@ -1868 +1861 @@
             vrc = VERR_BROKEN_PIPE;
     }
-    else if (prcGuest)
-        *prcGuest = vrcGuest;
+    else if (pvrcGuest)
+        *pvrcGuest = vrcGuest;
 
     LogFlowThisFunc(("Returning vrc=%Rrc, vrcGuest=%Rrc\n", vrc, vrcGuest));
@@ -1901 +1894 @@
  */
 /* static */
-Utf8Str GuestSession::i_guestErrorToString(int rcGuest)
+Utf8Str GuestSession::i_guestErrorToString(int vrcGuest)
 {
     Utf8Str strError;
 
     /** @todo pData->u32Flags: int vs. uint32 -- IPRT errors are *negative* !!! */
-    switch (rcGuest)
+    switch (vrcGuest)
     {
         case VERR_INVALID_VM_HANDLE:
@@ -1941 +1934 @@
 
         default:
-            strError.printf("%Rrc", rcGuest);
+            strError.printf("%Rrc", vrcGuest);
             break;
     }
@@ -2070 +2063 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    LogFlowThisFunc(("ID=%RU32, uType=%RU32, rcGuest=%Rrc\n",
-                     mData.mSession.mID, dataCb.uType, dataCb.uResult));
+    LogFlowThisFunc(("ID=%RU32, uType=%RU32, vrcGuest=%Rrc\n", mData.mSession.mID, dataCb.uType, dataCb.uResult));
 
     GuestSessionStatus_T sessionStatus = GuestSessionStatus_Undefined;
 
-    int rcGuest = dataCb.uResult; /** @todo uint32_t vs. int. */
+    int vrcGuest = dataCb.uResult; /** @todo uint32_t vs. int. */
     switch (dataCb.uType)
     {
         case GUEST_SESSION_NOTIFYTYPE_ERROR:
             sessionStatus = GuestSessionStatus_Error;
-            LogRel(("Guest Control: Error starting Session '%s' (%Rrc) \n", mData.mSession.mName.c_str(), rcGuest));
+            LogRel(("Guest Control: Error starting Session '%s' (%Rrc) \n", mData.mSession.mName.c_str(), vrcGuest));
             break;
 
@@ -2151 +2143 @@
     if (RT_SUCCESS(vrc))
     {
-        if (RT_FAILURE(rcGuest))
+        if (RT_FAILURE(vrcGuest))
             sessionStatus = GuestSessionStatus_Error;
     }
@@ -2157 +2149 @@
     /* Set the session status. */
     if (RT_SUCCESS(vrc))
-        vrc = i_setSessionStatus(sessionStatus, rcGuest);
-
-    LogFlowThisFunc(("ID=%RU32, rcGuest=%Rrc\n", mData.mSession.mID, rcGuest));
+        vrc = i_setSessionStatus(sessionStatus, vrcGuest);
+
+    LogFlowThisFunc(("ID=%RU32, vrcGuest=%Rrc\n", mData.mSession.mID, vrcGuest));
 
     LogFlowFuncLeaveRC(vrc);
@@ -2213 +2205 @@
  *
  * @returns VBox status code.
- * @param   prcGuest            Where to return the guest error when VERR_GSTCTL_GUEST_ERROR
- *                              was returned. Optional.
+ * @param   pvrcGuest           Where to return the guest error when
+ *                              VERR_GSTCTL_GUEST_ERROR was returned. Optional.
  *
  * @note    Takes the read and write locks.
  */
-int GuestSession::i_startSession(int *prcGuest)
+int GuestSession::i_startSession(int *pvrcGuest)
 {
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -2232 +2224 @@
         alock.release(); /* Release lock before changing status. */
 
-        /* ignore rc */ i_setSessionStatus(GuestSessionStatus_Started, VINF_SUCCESS);
+        i_setSessionStatus(GuestSessionStatus_Started, VINF_SUCCESS); /* ignore return code*/
         LogFlowThisFunc(("Installed Guest Additions don't support opening dedicated sessions, skipping\n"));
         return VINF_SUCCESS;
@@ -2287 +2279 @@
         vrc = i_waitForStatusChange(pEvent, GuestSessionWaitForFlag_Start,
                                     30 * 1000 /* 30s timeout */,
-                                    NULL /* Session status */, prcGuest);
+                                    NULL /* Session status */, pvrcGuest);
     }
     else
@@ -2297 +2289 @@
          * same function again will work though.
          */
-        /* ignore rc */ i_setSessionStatus(GuestSessionStatus_Error, vrc);
+        i_setSessionStatus(GuestSessionStatus_Error, vrc); /* ignore return code */
     }
 
@@ -2362 +2354 @@
         return VERR_COM_INVALID_OBJECT_STATE;
 
-    int vrc = pSession->i_startSession(NULL /* Guest rc, ignored */);
+    int vrc = pSession->i_startSession(NULL /*pvrcGuest*/);
     /* Nothing to do here anymore. */
 
@@ -2442 +2434 @@
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    int rc = VINF_SUCCESS;
-    AssertMsgStmt(ASMBitTestAndClear(&mData.bmObjectIds, idObject), ("idObject=%#x\n", idObject), rc = VERR_NOT_FOUND);
+    int vrc = VINF_SUCCESS;
+    AssertMsgStmt(ASMBitTestAndClear(&mData.bmObjectIds, idObject), ("idObject=%#x\n", idObject), vrc = VERR_NOT_FOUND);
 
     SessionObjects::iterator ItObj = mData.mObjects.find(idObject);
@@ -2449 +2441 @@
     mData.mObjects.erase(ItObj);
 
-    return rc;
+    return vrc;
 }
 
@@ -2548 +2540 @@
  * @param   strDest             Destination path on guest to rename \a strSource to.
  * @param   uFlags              Renaming flags.
- * @param   prcGuest            Where to return the guest error when VERR_GSTCTL_GUEST_ERROR
- *                              was returned. Optional.
+ * @param   pvrcGuest           Where to return the guest error when
+ *                              VERR_GSTCTL_GUEST_ERROR was returned. Optional.
  * @note    Takes the read lock.
  */
-int GuestSession::i_pathRename(const Utf8Str &strSource, const Utf8Str &strDest, uint32_t uFlags, int *prcGuest)
+int GuestSession::i_pathRename(const Utf8Str &strSource, const Utf8Str &strDest, uint32_t uFlags, int *pvrcGuest)
 {
     AssertReturn(!(uFlags & ~PATHRENAME_FLAG_VALID_MASK), VERR_INVALID_PARAMETER);
@@ -2583 +2575 @@
         vrc = pEvent->Wait(30 * 1000);
         if (   vrc == VERR_GSTCTL_GUEST_ERROR
-            && prcGuest)
-            *prcGuest = pEvent->GuestResult();
+            && pvrcGuest)
+            *pvrcGuest = pEvent->GuestResult();
     }
 
@@ -2597 +2589 @@
  *
  * @returns VBox status code.
- * @param   strPath             Where to store the user's document path.
- * @param   prcGuest            Guest rc, when returning VERR_GSTCTL_GUEST_ERROR.
- *                              Any other return code indicates some host side error.
+ * @param   strPath     Where to store the user's document path.
+ * @param   pvrcGuest   Guest VBox status code, when returning
+ *                      VERR_GSTCTL_GUEST_ERROR. Any other return code indicates
+ *                      some host side error.
  *
  * @note    Takes the read lock.
  */
-int GuestSession::i_pathUserDocuments(Utf8Str &strPath, int *prcGuest)
+int GuestSession::i_pathUserDocuments(Utf8Str &strPath, int *pvrcGuest)
 {
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -2633 +2626 @@
             if (vrc == VERR_GSTCTL_GUEST_ERROR)
             {
-                if (prcGuest)
-                    *prcGuest = pEvent->GuestResult();
+                if (pvrcGuest)
+                    *pvrcGuest = pEvent->GuestResult();
             }
         }
@@ -2649 +2642 @@
  *
  * @returns VBox status code.
- * @param   strPath             Where to store the user's home path.
- * @param   prcGuest            Guest rc, when returning VERR_GSTCTL_GUEST_ERROR.
- *                              Any other return code indicates some host side error.
+ * @param   strPath     Where to store the user's home path.
+ * @param   pvrcGuest   Guest VBox status code, when returning
+ *                      VERR_GSTCTL_GUEST_ERROR. Any other return code indicates
+ *                      some host side error.
  *
  * @note    Takes the read lock.
  */
-int GuestSession::i_pathUserHome(Utf8Str &strPath, int *prcGuest)
+int GuestSession::i_pathUserHome(Utf8Str &strPath, int *pvrcGuest)
 {
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -2685 +2679 @@
             if (vrc == VERR_GSTCTL_GUEST_ERROR)
             {
-                if (prcGuest)
-                    *prcGuest = pEvent->GuestResult();
+                if (pvrcGuest)
+                    *pvrcGuest = pEvent->GuestResult();
             }
         }
@@ -2717 +2711 @@
     LogFlowFunc(("Removing process (objectID=%RU32) ...\n", idObject));
 
-    int rc = i_objectUnregister(idObject);
-    if (RT_FAILURE(rc))
-        return rc;
+    int vrc = i_objectUnregister(idObject);
+    if (RT_FAILURE(vrc))
+        return vrc;
 
     SessionProcesses::iterator itProcs = mData.mProcesses.find(idObject);
@@ -2728 +2722 @@
 
     ULONG uPID;
-    HRESULT hr = pProc->COMGETTER(PID)(&uPID);
-    ComAssertComRC(hr);
+    HRESULT hrc = pProc->COMGETTER(PID)(&uPID);
+    ComAssertComRC(hrc);
 
     LogFlowFunc(("Removing process ID=%RU32 (session %RU32, guest PID %RU32, now total %zu processes)\n",
                  idObject, mData.mSession.mID, uPID, mData.mProcesses.size()));
 
-    rc = pProcess->i_onUnregister();
-    AssertRCReturn(rc, rc);
+    vrc = pProcess->i_onUnregister();
+    AssertRCReturn(vrc, vrc);
 
     mData.mProcesses.erase(itProcs);
@@ -2745 +2739 @@
     pProc.setNull();
 
-    LogFlowFuncLeaveRC(rc);
-    return rc;
+    LogFlowFuncLeaveRC(vrc);
+    return vrc;
 }
 
@@ -2818 +2812 @@
 
     /* Create the process object. */
-    HRESULT hr = pProcess.createObject();
-    if (FAILED(hr))
+    HRESULT hrc = pProcess.createObject();
+    if (FAILED(hrc))
         return VERR_COM_UNEXPECTED;
 
     /* Register a new object ID. */
     uint32_t idObject;
-    int rc = i_objectRegister(pProcess, SESSIONOBJECTTYPE_PROCESS, &idObject);
-    if (RT_FAILURE(rc))
+    int vrc = i_objectRegister(pProcess, SESSIONOBJECTTYPE_PROCESS, &idObject);
+    if (RT_FAILURE(vrc))
     {
         pProcess.setNull();
-        return rc;
-    }
-
-    rc = pProcess->init(mParent->i_getConsole() /* Console */, this /* Session */, idObject,
-                        procInfo, mData.mpBaseEnvironment);
-    if (RT_FAILURE(rc))
-        return rc;
+        return vrc;
+    }
+
+    vrc = pProcess->init(mParent->i_getConsole() /* Console */, this /* Session */, idObject, procInfo, mData.mpBaseEnvironment);
+    if (RT_FAILURE(vrc))
+        return vrc;
 
     /* Add the created process to our map. */
@@ -2850 +2843 @@
     catch (std::bad_alloc &)
     {
-        rc = VERR_NO_MEMORY;
-    }
-
-    return rc;
+        vrc = VERR_NO_MEMORY;
+    }
+
+    return vrc;
 }
 
@@ -2900 +2893 @@
 
         ULONG uCurPID;
-        HRESULT hr = pCurProc->COMGETTER(PID)(&uCurPID);
-        ComAssertComRC(hr);
+        HRESULT hrc = pCurProc->COMGETTER(PID)(&uCurPID);
+        ComAssertComRC(hrc);
 
         if (uCurPID == uPID)
@@ -2964 +2957 @@
  * @returns VBox status code.
  * @param   sessionStatus       Session status to set.
- * @param   sessionRc           Session result to set (for error handling).
+ * @param   vrcSession          Session result to set (for error handling).
  *
  * @note    Takes the write lock.
  */
-int GuestSession::i_setSessionStatus(GuestSessionStatus_T sessionStatus, int sessionRc)
-{
-    LogFlowThisFunc(("oldStatus=%RU32, newStatus=%RU32, sessionRc=%Rrc\n",
-                     mData.mStatus, sessionStatus, sessionRc));
+int GuestSession::i_setSessionStatus(GuestSessionStatus_T sessionStatus, int vrcSession)
+{
+    LogFlowThisFunc(("oldStatus=%RU32, newStatus=%RU32, vrcSession=%Rrc\n", mData.mStatus, sessionStatus, vrcSession));
 
     if (sessionStatus == GuestSessionStatus_Error)
     {
-        AssertMsg(RT_FAILURE(sessionRc), ("Guest rc must be an error (%Rrc)\n", sessionRc));
+        AssertMsg(RT_FAILURE(vrcSession), ("Guest vrcSession must be an error (%Rrc)\n", vrcSession));
         /* Do not allow overwriting an already set error. If this happens
          * this means we forgot some error checking/locking somewhere. */
-        AssertMsg(RT_SUCCESS(mData.mVrc), ("Guest rc already set (to %Rrc)\n", mData.mVrc));
+        AssertMsg(RT_SUCCESS(mData.mVrc), ("Guest mVrc already set (to %Rrc)\n", mData.mVrc));
     }
     else
-        AssertMsg(RT_SUCCESS(sessionRc), ("Guest rc must not be an error (%Rrc)\n", sessionRc));
+        AssertMsg(RT_SUCCESS(vrcSession), ("Guest vrcSession must not be an error (%Rrc)\n", vrcSession));
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -2990 +2982 @@
     {
         mData.mStatus = sessionStatus;
-        mData.mVrc    = sessionRc;
+        mData.mVrc    = vrcSession;
 
         /* Make sure to notify all underlying objects first. */
@@ -2996 +2988 @@
 
         ComObjPtr<VirtualBoxErrorInfo> errorInfo;
-        HRESULT hr = errorInfo.createObject();
-        ComAssertComRC(hr);
-        int rc2 = errorInfo->initEx(VBOX_E_IPRT_ERROR, sessionRc,
-                                    COM_IIDOF(IGuestSession), getComponentName(),
-                                    i_guestErrorToString(sessionRc));
-        AssertRC(rc2);
+        HRESULT hrc = errorInfo.createObject();
+        ComAssertComRC(hrc);
+        int vrc2 = errorInfo->initEx(VBOX_E_IPRT_ERROR, vrcSession, COM_IIDOF(IGuestSession), getComponentName(),
+                                     i_guestErrorToString(vrcSession));
+        AssertRC(vrc2);
 
         alock.release(); /* Release lock before firing off event. */
@@ -3013 +3004 @@
 
 /** @todo Unused --remove? */
-int GuestSession::i_signalWaiters(GuestSessionWaitResult_T enmWaitResult, int rc /*= VINF_SUCCESS */)
-{
-    RT_NOREF(enmWaitResult, rc);
-
-    /*LogFlowThisFunc(("enmWaitResult=%d, rc=%Rrc, mWaitCount=%RU32, mWaitEvent=%p\n",
-                     enmWaitResult, rc, mData.mWaitCount, mData.mWaitEvent));*/
+int GuestSession::i_signalWaiters(GuestSessionWaitResult_T enmWaitResult, int vrc /*= VINF_SUCCESS */)
+{
+    RT_NOREF(enmWaitResult, vrc);
+
+    /*LogFlowThisFunc(("enmWaitResult=%d, vrc=%Rrc, mWaitCount=%RU32, mWaitEvent=%p\n",
+                     enmWaitResult, vrc, mData.mWaitCount, mData.mWaitEvent));*/
 
     /* Note: No write locking here -- already done in the caller. */
 
-    int vrc = VINF_SUCCESS;
+    int vrc2 = VINF_SUCCESS;
     /*if (mData.mWaitEvent)
-        vrc = mData.mWaitEvent->Signal(enmWaitResult, rc);*/
-    LogFlowFuncLeaveRC(vrc);
-    return vrc;
+        vrc2 = mData.mWaitEvent->Signal(enmWaitResult, vrc);*/
+    LogFlowFuncLeaveRC(vrc2);
+    return vrc2;
 }
 
@@ -3034 +3025 @@
  *
  * @returns VBox status code. VERR_NOT_SUPPORTED if not supported by Guest Additions.
- * @param   fFlags              Guest shutdown flags.
- * @param   prcGuest            Guest rc, when returning VERR_GSTCTL_GUEST_ERROR.
- *                              Any other return code indicates some host side error.
+ * @param   fFlags      Guest shutdown flags.
+ * @param   pvrcGuest   Guest VBox status code, when returning
+ *                      VERR_GSTCTL_GUEST_ERROR. Any other return code indicates
+ *                      some host side error.
  *
  * @note    Takes the read lock.
  */
-int GuestSession::i_shutdown(uint32_t fFlags, int *prcGuest)
+int GuestSession::i_shutdown(uint32_t fFlags, int *pvrcGuest)
 {
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -3063 +3055 @@
     alock.release(); /* Drop lock before sending. */
 
-    int rcGuest = VERR_IPE_UNINITIALIZED_STATUS;
+    int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
 
     vrc = i_sendMessage(HOST_MSG_SHUTDOWN, i, paParms);
@@ -3072 +3064 @@
         {
             if (vrc == VERR_GSTCTL_GUEST_ERROR)
-                rcGuest = pEvent->GuestResult();
+                vrcGuest = pEvent->GuestResult();
         }
     }
@@ -3078 +3070 @@
     if (RT_FAILURE(vrc))
     {
-        LogRel(("Guest Control: Shutting down guest failed, rc=%Rrc\n",
-                vrc == VERR_GSTCTL_GUEST_ERROR ? rcGuest : vrc));
-
+        LogRel(("Guest Control: Shutting down guest failed, vrc=%Rrc\n", vrc == VERR_GSTCTL_GUEST_ERROR ? vrcGuest : vrc));
         if (   vrc == VERR_GSTCTL_GUEST_ERROR
-            && prcGuest)
-            *prcGuest = rcGuest;
+            && pvrcGuest)
+            *pvrcGuest = vrcGuest;
     }
 
@@ -3142 +3132 @@
  * @param   uTimeoutMS          Timeout (in ms) to wait.
  * @param   waitResult          Where to return the wait result on success.
- * @param   prcGuest            Where to return the guest error when VERR_GSTCTL_GUEST_ERROR
- *                              was returned. Optional.
+ * @param   pvrcGuest           Where to return the guest error when
+ *                              VERR_GSTCTL_GUEST_ERROR was returned. Optional.
  *
  * @note    Takes the read lock.
  */
-int GuestSession::i_waitFor(uint32_t fWaitFlags, ULONG uTimeoutMS, GuestSessionWaitResult_T &waitResult, int *prcGuest)
+int GuestSession::i_waitFor(uint32_t fWaitFlags, ULONG uTimeoutMS, GuestSessionWaitResult_T &waitResult, int *pvrcGuest)
 {
     LogFlowThisFuncEnter();
@@ -3153 +3143 @@
     AssertReturn(fWaitFlags, VERR_INVALID_PARAMETER);
 
-    /*LogFlowThisFunc(("fWaitFlags=0x%x, uTimeoutMS=%RU32, mStatus=%RU32, mWaitCount=%RU32, mWaitEvent=%p, prcGuest=%p\n",
-                     fWaitFlags, uTimeoutMS, mData.mStatus, mData.mWaitCount, mData.mWaitEvent, prcGuest));*/
+    /*LogFlowThisFunc(("fWaitFlags=0x%x, uTimeoutMS=%RU32, mStatus=%RU32, mWaitCount=%RU32, mWaitEvent=%p, pvrcGuest=%p\n",
+                     fWaitFlags, uTimeoutMS, mData.mStatus, mData.mWaitCount, mData.mWaitEvent, pvrcGuest));*/
 
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -3162 +3152 @@
     {
         waitResult = GuestSessionWaitResult_Error;
-        AssertMsg(RT_FAILURE(mData.mVrc), ("No error rc (%Rrc) set when guest session indicated an error\n", mData.mVrc));
-        if (prcGuest)
-            *prcGuest = mData.mVrc; /* Return last set error. */
+        AssertMsg(RT_FAILURE(mData.mVrc), ("No error mVrc (%Rrc) set when guest session indicated an error\n", mData.mVrc));
+        if (pvrcGuest)
+            *pvrcGuest = mData.mVrc; /* Return last set error. */
         return VERR_GSTCTL_GUEST_ERROR;
     }
@@ -3241 +3231 @@
     }
 
-    LogFlowThisFunc(("sessionStatus=%RU32, sessionRc=%Rrc, waitResult=%RU32\n", mData.mStatus, mData.mVrc, waitResult));
+    LogFlowThisFunc(("sessionStatus=%RU32, vrcSession=%Rrc, waitResult=%RU32\n", mData.mStatus, mData.mVrc, waitResult));
 
     /* No waiting needed? Return immediately using the last set error. */
     if (waitResult != GuestSessionWaitResult_None)
     {
-        if (prcGuest)
-            *prcGuest = mData.mVrc; /* Return last set error (if any). */
+        if (pvrcGuest)
+            *pvrcGuest = mData.mVrc; /* Return last set error (if any). */
         return RT_SUCCESS(mData.mVrc) ? VINF_SUCCESS : VERR_GSTCTL_GUEST_ERROR;
     }
@@ -3278 +3268 @@
         GuestSessionStatus_T sessionStatus;
         vrc = i_waitForStatusChange(pEvent, fWaitFlags,
-                                    uTimeoutMS - (tsNow - tsStart), &sessionStatus, prcGuest);
+                                    uTimeoutMS - (tsNow - tsStart), &sessionStatus, pvrcGuest);
         if (RT_SUCCESS(vrc))
         {
@@ -3351 +3341 @@
  * @param   uTimeoutMS          Timeout (in ms) to wait.
  * @param   pSessionStatus      Where to return the guest session status.
- * @param   prcGuest            Where to return the guest error when VERR_GSTCTL_GUEST_ERROR
- *                              was returned. Optional.
+ * @param   pvrcGuest           Where to return the guest error when
+ *                              VERR_GSTCTL_GUEST_ERROR was returned. Optional.
  */
 int GuestSession::i_waitForStatusChange(GuestWaitEvent *pEvent, uint32_t fWaitFlags, uint32_t uTimeoutMS,
-                                        GuestSessionStatus_T *pSessionStatus, int *prcGuest)
+                                        GuestSessionStatus_T *pSessionStatus, int *pvrcGuest)
 {
     RT_NOREF(fWaitFlags);
@@ -3376 +3366 @@
 
             ComPtr<IVirtualBoxErrorInfo> errorInfo;
-            HRESULT hr = pChangedEvent->COMGETTER(Error)(errorInfo.asOutParam());
-            ComAssertComRC(hr);
+            HRESULT hrc = pChangedEvent->COMGETTER(Error)(errorInfo.asOutParam());
+            ComAssertComRC(hrc);
 
             LONG lGuestRc;
-            hr = errorInfo->COMGETTER(ResultDetail)(&lGuestRc);
-            ComAssertComRC(hr);
+            hrc = errorInfo->COMGETTER(ResultDetail)(&lGuestRc);
+            ComAssertComRC(hrc);
             if (RT_FAILURE((int)lGuestRc))
                 vrc = VERR_GSTCTL_GUEST_ERROR;
-            if (prcGuest)
-                *prcGuest = (int)lGuestRc;
+            if (pvrcGuest)
+                *pvrcGuest = (int)lGuestRc;
 
             LogFlowThisFunc(("Status changed event for session ID=%RU32, new status is: %RU32 (%Rrc)\n",
@@ -3394 +3384 @@
             AssertMsgFailedReturn(("Got unexpected event type %#x\n", evtType), VERR_WRONG_ORDER);
     }
-    /* waitForEvent may also return VERR_GSTCTL_GUEST_ERROR like we do above, so make prcGuest is set. */
-    else if (vrc == VERR_GSTCTL_GUEST_ERROR && prcGuest)
-        *prcGuest = pEvent->GuestResult();
-    Assert(vrc != VERR_GSTCTL_GUEST_ERROR || !prcGuest || *prcGuest != (int)0xcccccccc);
+    /* waitForEvent may also return VERR_GSTCTL_GUEST_ERROR like we do above, so make pvrcGuest is set. */
+    else if (vrc == VERR_GSTCTL_GUEST_ERROR && pvrcGuest)
+        *pvrcGuest = pEvent->GuestResult();
+    Assert(vrc != VERR_GSTCTL_GUEST_ERROR || !pvrcGuest || *pvrcGuest != (int)0xcccccccc);
 
     LogFlowFuncLeaveRC(vrc);
@@ -3413 +3403 @@
      *       the session (already) could be in a stopped / aborted state. */
 
-    int vrc     = VINF_SUCCESS; /* Shut up MSVC. */
-    int rcGuest = VINF_SUCCESS;
+    int vrc      = VINF_SUCCESS; /* Shut up MSVC. */
+    int vrcGuest = VINF_SUCCESS;
 
     uint32_t msTimeout = RT_MS_10SEC; /* 10s timeout by default */
@@ -3427 +3417 @@
 
         /* Close session on guest. */
-        vrc = i_closeSession(0 /* Flags */, msTimeout, &rcGuest);
+        vrc = i_closeSession(0 /* Flags */, msTimeout, &vrcGuest);
         if (   RT_SUCCESS(vrc)
             || vrc != VERR_TIMEOUT) /* If something else happened there is no point in retrying further. */
@@ -3445 +3435 @@
         vrc = vrc2;
 
-    LogFlowThisFunc(("Returning rc=%Rrc, rcGuest=%Rrc\n", vrc, rcGuest));
+    LogFlowThisFunc(("Returning vrc=%Rrc, vrcGuest=%Rrc\n", vrc, vrcGuest));
 
     if (RT_FAILURE(vrc))
@@ -3451 +3441 @@
         if (vrc == VERR_GSTCTL_GUEST_ERROR)
         {
-            GuestErrorInfo ge(GuestErrorInfo::Type_Session, rcGuest, mData.mSession.mName.c_str());
-            return setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Closing guest session failed: %s"),
+            GuestErrorInfo ge(GuestErrorInfo::Type_Session, vrcGuest, mData.mSession.mName.c_str());
+            return setErrorBoth(VBOX_E_IPRT_ERROR, vrcGuest, tr("Closing guest session failed: %s"),
                                 GuestBase::getErrorAsString(ge).c_str());
         }
@@ -3551 +3541 @@
     {
         GuestFsObjData objData;
-        int rcGuest = VERR_IPE_UNINITIALIZED_STATUS;
-        int vrc = i_fsQueryInfo(*(itSource), fFollowSymlinks, objData, &rcGuest);
+        int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
+        int vrc = i_fsQueryInfo(*(itSource), fFollowSymlinks, objData, &vrcGuest);
         if (   RT_FAILURE(vrc)
             && !fContinueOnErrors)
@@ -3558 +3548 @@
             if (GuestProcess::i_isGuestError(vrc))
             {
-                GuestErrorInfo ge(GuestErrorInfo::Type_Process, rcGuest, (*itSource).c_str());
-                return setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Querying type for guest source failed: %s"),
+                GuestErrorInfo ge(GuestErrorInfo::Type_Process, vrcGuest, (*itSource).c_str());
+                return setErrorBoth(VBOX_E_IPRT_ERROR, vrcGuest, tr("Querying type for guest source failed: %s"),
                                     GuestBase::getErrorAsString(ge).c_str());
             }
@@ -3757 +3747 @@
     LogFlowThisFuncEnter();
 
-    ComObjPtr <GuestDirectory> pDirectory; int rcGuest = VERR_IPE_UNINITIALIZED_STATUS;
-    int vrc = i_directoryCreate(aPath, (uint32_t)aMode, fFlags, &rcGuest);
+    ComObjPtr <GuestDirectory> pDirectory;
+    int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
+    int vrc = i_directoryCreate(aPath, (uint32_t)aMode, fFlags, &vrcGuest);
     if (RT_FAILURE(vrc))
     {
         if (GuestProcess::i_isGuestError(vrc))
         {
-            GuestErrorInfo ge(GuestErrorInfo::Type_Directory, rcGuest, aPath.c_str());
-            return setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Guest directory creation failed: %s"),
+            GuestErrorInfo ge(GuestErrorInfo::Type_Directory, vrcGuest, aPath.c_str());
+            return setErrorBoth(VBOX_E_IPRT_ERROR, vrcGuest, tr("Guest directory creation failed: %s"),
                                 GuestBase::getErrorAsString(ge).c_str());
         }
@@ -3803 +3794 @@
     LogFlowThisFuncEnter();
 
-    int rcGuest = VERR_IPE_UNINITIALIZED_STATUS;
-    int vrc = i_fsCreateTemp(aTemplateName, aPath, true /* Directory */, aDirectory, aMode, RT_BOOL(aSecure), &rcGuest);
+    int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
+    int vrc = i_fsCreateTemp(aTemplateName, aPath, true /* Directory */, aDirectory, aMode, RT_BOOL(aSecure), &vrcGuest);
     if (!RT_SUCCESS(vrc))
     {
@@ -3811 +3802 @@
             case VERR_GSTCTL_GUEST_ERROR:
             {
-                GuestErrorInfo ge(GuestErrorInfo::Type_ToolMkTemp, rcGuest, aPath.c_str());
-                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Temporary guest directory creation failed: %s"),
+                GuestErrorInfo ge(GuestErrorInfo::Type_ToolMkTemp, vrcGuest, aPath.c_str());
+                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrcGuest, tr("Temporary guest directory creation failed: %s"),
                                    GuestBase::getErrorAsString(ge).c_str());
                 break;
@@ -3838 +3829 @@
 
     GuestFsObjData objData;
-    int rcGuest = VERR_IPE_UNINITIALIZED_STATUS;
-
-    int vrc = i_directoryQueryInfo(aPath, aFollowSymlinks != FALSE, objData, &rcGuest);
+    int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
+
+    int vrc = i_directoryQueryInfo(aPath, aFollowSymlinks != FALSE, objData, &vrcGuest);
     if (RT_SUCCESS(vrc))
         *aExists = TRUE;
@@ -3849 +3840 @@
             case VERR_GSTCTL_GUEST_ERROR:
             {
-                switch (rcGuest)
+                switch (vrcGuest)
                 {
                     case VERR_PATH_NOT_FOUND:
@@ -3856 +3847 @@
                     default:
                     {
-                        GuestErrorInfo ge(GuestErrorInfo::Type_ToolStat, rcGuest, aPath.c_str());
-                        hrc = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Querying directory existence failed: %s"),
+                        GuestErrorInfo ge(GuestErrorInfo::Type_ToolStat, vrcGuest, aPath.c_str());
+                        hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrcGuest, tr("Querying directory existence failed: %s"),
                                            GuestBase::getErrorAsString(ge).c_str());
                         break;
@@ -3910 +3901 @@
     openInfo.mFlags = fFlags;
 
-    ComObjPtr<GuestDirectory> pDirectory; int rcGuest = VERR_IPE_UNINITIALIZED_STATUS;
-    int vrc = i_directoryOpen(openInfo, pDirectory, &rcGuest);
+    ComObjPtr<GuestDirectory> pDirectory;
+    int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
+    int vrc = i_directoryOpen(openInfo, pDirectory, &vrcGuest);
     if (RT_SUCCESS(vrc))
     {
@@ -3928 +3920 @@
             case VERR_GSTCTL_GUEST_ERROR:
             {
-                GuestErrorInfo ge(GuestErrorInfo::Type_Directory, rcGuest, aPath.c_str());
-                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Opening guest directory failed: %s"),
+                GuestErrorInfo ge(GuestErrorInfo::Type_Directory, vrcGuest, aPath.c_str());
+                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrcGuest, tr("Opening guest directory failed: %s"),
                                    GuestBase::getErrorAsString(ge).c_str());
                 break;
@@ -3956 +3948 @@
     uint32_t fFlags = DIRREMOVEREC_FLAG_NONE;
 
-    int rcGuest = VERR_IPE_UNINITIALIZED_STATUS;
-    int vrc = i_directoryRemove(aPath, fFlags, &rcGuest);
+    int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
+    int vrc = i_directoryRemove(aPath, fFlags, &vrcGuest);
     if (RT_FAILURE(vrc))
     {
@@ -3969 +3961 @@
             case VERR_GSTCTL_GUEST_ERROR:
             {
-                GuestErrorInfo ge(GuestErrorInfo::Type_Directory, rcGuest, aPath.c_str());
-                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Removing guest directory failed: %s"),
+                GuestErrorInfo ge(GuestErrorInfo::Type_Directory, vrcGuest, aPath.c_str());
+                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrcGuest, tr("Removing guest directory failed: %s"),
                                    GuestBase::getErrorAsString(ge).c_str());
                 break;
@@ -4037 +4029 @@
         return hrc;
 
-    int rcGuest = VERR_IPE_UNINITIALIZED_STATUS;
-    int vrc = i_directoryRemove(aPath, fFlags, &rcGuest);
+    int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
+    int vrc = i_directoryRemove(aPath, fFlags, &vrcGuest);
     if (RT_FAILURE(vrc))
     {
@@ -4050 +4042 @@
             case VERR_GSTCTL_GUEST_ERROR:
             {
-                GuestErrorInfo ge(GuestErrorInfo::Type_Directory, rcGuest, aPath.c_str());
-                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Recursively removing guest directory failed: %s"),
+                GuestErrorInfo ge(GuestErrorInfo::Type_Directory, vrcGuest, aPath.c_str());
+                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrcGuest, tr("Recursively removing guest directory failed: %s"),
                                    GuestBase::getErrorAsString(ge).c_str());
                 break;
@@ -4176 +4168 @@
     LogFlowThisFuncEnter();
 
-    GuestFsObjData objData; int rcGuest = VERR_IPE_UNINITIALIZED_STATUS;
-    int vrc = i_fileQueryInfo(aPath, RT_BOOL(aFollowSymlinks), objData, &rcGuest);
+    GuestFsObjData objData;
+    int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
+    int vrc = i_fileQueryInfo(aPath, RT_BOOL(aFollowSymlinks), objData, &vrcGuest);
     if (RT_SUCCESS(vrc))
     {
@@ -4188 +4181 @@
         case VERR_GSTCTL_GUEST_ERROR:
         {
-            switch (rcGuest)
+            switch (vrcGuest)
             {
                 case VERR_PATH_NOT_FOUND:
@@ -4197 +4190 @@
                 default:
                 {
-                    GuestErrorInfo ge(GuestErrorInfo::Type_ToolStat, rcGuest, aPath.c_str());
-                    hrc = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Querying guest file existence failed: %s"),
+                    GuestErrorInfo ge(GuestErrorInfo::Type_ToolStat, vrcGuest, aPath.c_str());
+                    hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrcGuest, tr("Querying guest file existence failed: %s"),
                                        GuestBase::getErrorAsString(ge).c_str());
                     break;
@@ -4302 +4295 @@
 
     ComObjPtr <GuestFile> pFile;
-    int rcGuest = VERR_IPE_UNINITIALIZED_STATUS;
-    int vrc = i_fileOpenEx(aPath, aAccessMode, aOpenAction, aSharingMode, aCreationMode, aFlags, pFile, &rcGuest);
+    int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
+    int vrc = i_fileOpenEx(aPath, aAccessMode, aOpenAction, aSharingMode, aCreationMode, aFlags, pFile, &vrcGuest);
     if (RT_SUCCESS(vrc))
         /* Return directory object to the caller. */
@@ -4318 +4311 @@
             case VERR_GSTCTL_GUEST_ERROR:
             {
-                GuestErrorInfo ge(GuestErrorInfo::Type_File, rcGuest, aPath.c_str());
-                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Opening guest file failed: %s"),
+                GuestErrorInfo ge(GuestErrorInfo::Type_File, vrcGuest, aPath.c_str());
+                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrcGuest, tr("Opening guest file failed: %s"),
                                    GuestBase::getErrorAsString(ge).c_str());
                 break;
@@ -4341 +4334 @@
         return hrc;
 
-    int64_t llSize; int rcGuest = VERR_IPE_UNINITIALIZED_STATUS;
-    int vrc = i_fileQuerySize(aPath, aFollowSymlinks != FALSE,  &llSize, &rcGuest);
+    int64_t llSize;
+    int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
+    int vrc = i_fileQuerySize(aPath, aFollowSymlinks != FALSE,  &llSize, &vrcGuest);
     if (RT_SUCCESS(vrc))
-    {
         *aSize = llSize;
-    }
     else
     {
         if (GuestProcess::i_isGuestError(vrc))
         {
-            GuestErrorInfo ge(GuestErrorInfo::Type_ToolStat, rcGuest, aPath.c_str());
-            hrc = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Querying guest file size failed: %s"),
+            GuestErrorInfo ge(GuestErrorInfo::Type_ToolStat, vrcGuest, aPath.c_str());
+            hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrcGuest, tr("Querying guest file size failed: %s"),
                                GuestBase::getErrorAsString(ge).c_str());
         }
@@ -4391 +4383 @@
 
     GuestFsObjData objData;
-    int rcGuest = VERR_IPE_UNINITIALIZED_STATUS;
-    int vrc = i_fsQueryInfo(aPath, aFollowSymlinks != FALSE, objData, &rcGuest);
+    int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
+    int vrc = i_fsQueryInfo(aPath, aFollowSymlinks != FALSE, objData, &vrcGuest);
     if (RT_SUCCESS(vrc))
-    {
         *aExists = TRUE;
-    }
     else
     {
         if (GuestProcess::i_isGuestError(vrc))
         {
-            if (   rcGuest == VERR_NOT_A_FILE
-                || rcGuest == VERR_PATH_NOT_FOUND
-                || rcGuest == VERR_FILE_NOT_FOUND
-                || rcGuest == VERR_INVALID_NAME)
-            {
+            if (   vrcGuest == VERR_NOT_A_FILE
+                || vrcGuest == VERR_PATH_NOT_FOUND
+                || vrcGuest == VERR_FILE_NOT_FOUND
+                || vrcGuest == VERR_INVALID_NAME)
                 hrc = S_OK; /* Ignore these vrc values. */
-            }
             else
             {
-                GuestErrorInfo ge(GuestErrorInfo::Type_ToolStat, rcGuest, aPath.c_str());
-                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Querying guest file existence information failed: %s"),
+                GuestErrorInfo ge(GuestErrorInfo::Type_ToolStat, vrcGuest, aPath.c_str());
+                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrcGuest, tr("Querying guest file existence information failed: %s"),
                                    GuestBase::getErrorAsString(ge).c_str());
             }
@@ -4433 +4421 @@
     LogFlowThisFunc(("aPath=%s, aFollowSymlinks=%RTbool\n", aPath.c_str(), RT_BOOL(aFollowSymlinks)));
 
-    GuestFsObjData Info; int rcGuest = VERR_IPE_UNINITIALIZED_STATUS;
-    int vrc = i_fsQueryInfo(aPath, aFollowSymlinks != FALSE, Info, &rcGuest);
+    GuestFsObjData Info;
+    int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
+    int vrc = i_fsQueryInfo(aPath, aFollowSymlinks != FALSE, Info, &vrcGuest);
     if (RT_SUCCESS(vrc))
     {
@@ -4452 +4441 @@
         if (GuestProcess::i_isGuestError(vrc))
         {
-            GuestErrorInfo ge(GuestErrorInfo::Type_ToolStat, rcGuest, aPath.c_str());
-            hrc = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Querying guest file information failed: %s"),
+            GuestErrorInfo ge(GuestErrorInfo::Type_ToolStat, vrcGuest, aPath.c_str());
+            hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrcGuest, tr("Querying guest file information failed: %s"),
                                GuestBase::getErrorAsString(ge).c_str());
         }
@@ -4474 +4463 @@
     LogFlowThisFunc(("aPath=%s\n", aPath.c_str()));
 
-    int rcGuest = VERR_IPE_UNINITIALIZED_STATUS;
-    int vrc = i_fileRemove(aPath, &rcGuest);
+    int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
+    int vrc = i_fileRemove(aPath, &vrcGuest);
     if (RT_FAILURE(vrc))
     {
         if (GuestProcess::i_isGuestError(vrc))
         {
-            GuestErrorInfo ge(GuestErrorInfo::Type_ToolRm, rcGuest, aPath.c_str());
-            hrc = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Removing guest file failed: %s"),
+            GuestErrorInfo ge(GuestErrorInfo::Type_ToolRm, vrcGuest, aPath.c_str());
+            hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrcGuest, tr("Removing guest file failed: %s"),
                                GuestBase::getErrorAsString(ge).c_str());
         }
@@ -4529 +4518 @@
 
     /* Call worker to do the job. */
-    int rcGuest = VERR_IPE_UNINITIALIZED_STATUS;
-    int vrc = i_pathRename(aSource, aDestination, fBackend, &rcGuest);
+    int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS;
+    int vrc = i_pathRename(aSource, aDestination, fBackend, &vrcGuest);
     if (RT_FAILURE(vrc))
     {
@@ -4542 +4531 @@
             case VERR_GSTCTL_GUEST_ERROR:
             {
-                GuestErrorInfo ge(GuestErrorInfo::Type_Process, rcGuest, aSource.c_str());
-                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Renaming guest path failed: %s"),
+                GuestErrorInfo ge(GuestErrorInfo::Type_Process, vrcGuest, aSource.c_str());
+                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrcGuest, tr("Renaming guest path failed: %s"),
                                    GuestBase::getErrorAsString(ge).c_str());
                 break;
@@ -4607 +4596 @@
                                       ComPtr<IGuestProcess> &aGuestProcess)
 {
-    HRESULT hr = i_isStartedExternal();
-    if (FAILED(hr))
-        return hr;
+    HRESULT hrc = i_isStartedExternal();
+    if (FAILED(hrc))
+        return hrc;
 
     /*
@@ -4676 +4665 @@
             {
                 ComPtr<IGuestProcess> pIProcess;
-                hr = pProcess.queryInterfaceTo(pIProcess.asOutParam());
-                if (SUCCEEDED(hr))
+                hrc = pProcess.queryInterfaceTo(pIProcess.asOutParam());
+                if (SUCCEEDED(hrc))
                 {
                     /*
@@ -4691 +4680 @@
                     }
 
-                    hr = setErrorVrc(vrc, tr("Failed to start guest process: %Rrc"), vrc);
+                    hrc = setErrorVrc(vrc, tr("Failed to start guest process: %Rrc"), vrc);
                 }
             }
             else if (vrc == VERR_GSTCTL_MAX_CID_OBJECTS_REACHED)
-                hr = setErrorVrc(vrc, tr("Maximum number of concurrent guest processes per session (%u) reached"),
+                hrc = setErrorVrc(vrc, tr("Maximum number of concurrent guest processes per session (%u) reached"),
                                  VBOX_GUESTCTRL_MAX_OBJECTS);
             else
-                hr = setErrorVrc(vrc, tr("Failed to create guest process object: %Rrc"), vrc);
+                hrc = setErrorVrc(vrc, tr("Failed to create guest process object: %Rrc"), vrc);
         }
         else
-            hr = setErrorBoth(vrc == VERR_ENV_INVALID_VAR_NAME ? E_INVALIDARG : Global::vboxStatusCodeToCOM(vrc), vrc,
+            hrc = setErrorBoth(vrc == VERR_ENV_INVALID_VAR_NAME ? E_INVALIDARG : Global::vboxStatusCodeToCOM(vrc), vrc,
                               tr("Failed to apply environment variable '%s', index %u (%Rrc)'"),
                               aEnvironment[idxError].c_str(), idxError, vrc);
     }
     else
-        hr = setErrorVrc(vrc, tr("Failed to set up the environment: %Rrc"), vrc);
+        hrc = setErrorVrc(vrc, tr("Failed to set up the environment: %Rrc"), vrc);
 
     LogFlowFuncLeaveRC(vrc);
-    return hr;
+    return hrc;
 }
 
@@ -4722 +4711 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    HRESULT hr = S_OK;
+    HRESULT hrc = S_OK;
 
     ComObjPtr<GuestProcess> pProcess;
-    int rc = i_processGetByPID(aPid, &pProcess);
-    if (RT_FAILURE(rc))
-        hr = setError(E_INVALIDARG, tr("No process with PID %RU32 found"), aPid);
+    int vrc = i_processGetByPID(aPid, &pProcess);
+    if (RT_FAILURE(vrc))
+        hrc = setError(E_INVALIDARG, tr("No process with PID %RU32 found"), aPid);
 
     /* This will set (*aProcess) to NULL if pProgress is NULL. */
-    HRESULT hr2 = pProcess.queryInterfaceTo(aGuestProcess.asOutParam());
-    if (SUCCEEDED(hr))
-        hr = hr2;
-
-    LogFlowThisFunc(("aProcess=%p, hr=%Rhrc\n", (IGuestProcess*)aGuestProcess, hr));
-    return hr;
+    HRESULT hrc2 = pProcess.queryInterfaceTo(aGuestProcess.asOutParam());
+    if (SUCCEEDED(hrc))
+        hrc = hrc2;
+
+    LogFlowThisFunc(("aProcess=%p, hrc=%Rhrc\n", (IGuestProcess*)aGuestProcess, hrc));
+    return hrc;
 }
 
@@ -4769 +4758 @@
      * Note: Do not hold any locks here while waiting!
      */
-    int rcGuest = VERR_IPE_UNINITIALIZED_STATUS; GuestSessionWaitResult_T waitResult;
-    int vrc = i_waitFor(aWaitFor, aTimeoutMS, waitResult, &rcGuest);
+    int vrcGuest = VERR_IPE_UNINITIALIZED_STATUS; GuestSessionWaitResult_T waitResult;
+    int vrc = i_waitFor(aWaitFor, aTimeoutMS, waitResult, &vrcGuest);
     if (RT_SUCCESS(vrc))
         *aReason = waitResult;
@@ -4779 +4768 @@
             case VERR_GSTCTL_GUEST_ERROR:
             {
-                GuestErrorInfo ge(GuestErrorInfo::Type_Session, rcGuest, mData.mSession.mName.c_str());
-                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, rcGuest, tr("Waiting for guest process failed: %s"),
+                GuestErrorInfo ge(GuestErrorInfo::Type_Session, vrcGuest, mData.mSession.mName.c_str());
+                hrc = setErrorBoth(VBOX_E_IPRT_ERROR, vrcGuest, tr("Waiting for guest process failed: %s"),
                                    GuestBase::getErrorAsString(ge).c_str());
                 break;

trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp

@@ -111 +111 @@
     /* Create the progress object. */
     ComObjPtr<Progress> pProgress;
-    HRESULT hr = pProgress.createObject();
-    if (FAILED(hr))
+    HRESULT hrc = pProgress.createObject();
+    if (FAILED(hrc))
         return VERR_COM_UNEXPECTED;
 
-    hr = pProgress->init(static_cast<IGuestSession*>(mSession),
-                         Bstr(mDesc).raw(),
-                         TRUE /* aCancelable */, cOperations, Bstr(mDesc).raw());
-    if (FAILED(hr))
+    hrc = pProgress->init(static_cast<IGuestSession*>(mSession),
+                          Bstr(mDesc).raw(),
+                          TRUE /* aCancelable */, cOperations, Bstr(mDesc).raw());
+    if (FAILED(hrc))
         return VERR_COM_UNEXPECTED;
 
@@ -159 +159 @@
     Bstr strTemp, strFlags;
     LONG64 i64Timestamp;
-    HRESULT hr = pMachine->GetGuestProperty(Bstr(strPath).raw(),
-                                            strTemp.asOutParam(),
-                                            &i64Timestamp, strFlags.asOutParam());
-    if (SUCCEEDED(hr))
+    HRESULT hrc = pMachine->GetGuestProperty(Bstr(strPath).raw(), strTemp.asOutParam(), &i64Timestamp, strFlags.asOutParam());
+    if (SUCCEEDED(hrc))
     {
         strValue = strTemp;
@@ -192 +190 @@
         return VINF_SUCCESS;
     }
-    HRESULT hr = mProgress->SetCurrentOperationProgress(uPercent);
-    if (FAILED(hr))
+    HRESULT hrc = mProgress->SetCurrentOperationProgress(uPercent);
+    if (FAILED(hrc))
         return VERR_COM_UNEXPECTED;
 
@@ -218 +216 @@
         AssertMsg(uCurOp + 1 /* Zero-based */ == cOps, ("Not all operations done yet (%u/%u)\n", uCurOp + 1, cOps));
 #endif
-        HRESULT hr = mProgress->i_notifyComplete(S_OK);
-        if (FAILED(hr))
-            return VERR_COM_UNEXPECTED; /** @todo Find a better rc. */
+        HRESULT hrc = mProgress->i_notifyComplete(S_OK);
+        if (FAILED(hrc))
+            return VERR_COM_UNEXPECTED; /** @todo Find a better vrc. */
     }
 
@@ -229 +227 @@
  * Sets the task's progress object to an error using a string message.
  *
- * @returns Returns \a hr for convenience.
- * @param   hr                  Progress operation result to set.
+ * @returns Returns \a hrc for convenience.
+ * @param   hrc                 Progress operation result to set.
  * @param   strMsg              Message to set.
  */
-HRESULT GuestSessionTask::setProgressErrorMsg(HRESULT hr, const Utf8Str &strMsg)
-{
-    LogFlowFunc(("hr=%Rhrc, strMsg=%s\n", hr, strMsg.c_str()));
+HRESULT GuestSessionTask::setProgressErrorMsg(HRESULT hrc, const Utf8Str &strMsg)
+{
+    LogFlowFunc(("hrc=%Rhrc, strMsg=%s\n", hrc, strMsg.c_str()));
 
     if (mProgress.isNull()) /* Progress is optional. */
-        return hr; /* Return original rc. */
+        return hrc; /* Return original status. */
 
     BOOL fCanceled;
@@ -247 +245 @@
         && !fCompleted)
     {
-        HRESULT hr2 = mProgress->i_notifyComplete(hr,
-                                                  COM_IIDOF(IGuestSession),
-                                                  GuestSession::getStaticComponentName(),
-                                                  /* Make sure to hand-in the message via format string to avoid problems
-                                                   * with (file) paths which e.g. contain "%s" and friends. Can happen with
-                                                   * randomly generated Validation Kit stuff. */
-                                                  "%s", strMsg.c_str());
-        if (FAILED(hr2))
-            return hr2;
-    }
-    return hr; /* Return original rc. */
+        HRESULT hrc2 = mProgress->i_notifyComplete(hrc,
+                                                   COM_IIDOF(IGuestSession),
+                                                   GuestSession::getStaticComponentName(),
+                                                   /* Make sure to hand-in the message via format string to avoid problems
+                                                    * with (file) paths which e.g. contain "%s" and friends. Can happen with
+                                                    * randomly generated Validation Kit stuff. */
+                                                   "%s", strMsg.c_str());
+        if (FAILED(hrc2))
+            return hrc2;
+    }
+    return hrc; /* Return original status. */
 }
 
@@ -263 +261 @@
  * Sets the task's progress object to an error using a string message and a guest error info object.
  *
- * @returns Returns \a hr for convenience.
- * @param   hr                  Progress operation result to set.
+ * @returns Returns \a hrc for convenience.
+ * @param   hrc                 Progress operation result to set.
  * @param   strMsg              Message to set.
  * @param   guestErrorInfo      Guest error info to use.
  */
-HRESULT GuestSessionTask::setProgressErrorMsg(HRESULT hr, const Utf8Str &strMsg, const GuestErrorInfo &guestErrorInfo)
-{
-    return setProgressErrorMsg(hr, strMsg + Utf8Str(": ") + GuestBase::getErrorAsString(guestErrorInfo));
+HRESULT GuestSessionTask::setProgressErrorMsg(HRESULT hrc, const Utf8Str &strMsg, const GuestErrorInfo &guestErrorInfo)
+{
+    return setProgressErrorMsg(hrc, strMsg + Utf8Str(": ") + GuestBase::getErrorAsString(guestErrorInfo));
 }
 
@@ -1371 +1369 @@
 
                                     if (RT_FAILURE(vrc))
-                                        LogRel2(("Guest Control: Unable to query symbolic link info for \"%s\", rc=%Rrc\n",
+                                        LogRel2(("Guest Control: Unable to query symbolic link info for \"%s\", vrc=%Rrc\n",
                                                  pszPathReal, vrc));
                                 }
                                 else
                                 {
-                                    LogRel2(("Guest Control: Unable to resolve symlink for \"%s\", rc=%Rrc\n", strPathAbs.c_str(), vrc));
+                                    LogRel2(("Guest Control: Unable to resolve symlink for \"%s\", vrc=%Rrc\n",
+                                             strPathAbs.c_str(), vrc));
                                     if (vrc == VERR_FILE_NOT_FOUND) /* Broken symlink, skip. */
                                         vrc = VINF_SUCCESS;
@@ -1401 +1400 @@
     }
     else
-        LogFlowFunc(("Unable to query \"%s\", rc=%Rrc\n", strPathAbs.c_str(), vrc));
+        LogFlowFunc(("Unable to query \"%s\", vrc=%Rrc\n", strPathAbs.c_str(), vrc));
 
     LogFlowFuncLeaveRC(vrc);
@@ -2657 +2656 @@
                 break;
 
-            case VERR_INVALID_STATE: /** @todo Special guest control rc needed! */
+            case VERR_INVALID_STATE: /** @todo Special guest control vrc needed! */
                 setProgressErrorMsg(VBOX_E_IPRT_ERROR,
                                     Utf8StrFmt(tr("Update file \"%s\" reported invalid running state"),
@@ -2684 +2683 @@
 {
     int vrc                         = VERR_GSTCTL_GUEST_ERROR;
-    int rc                          = VERR_TIMEOUT;
+    int vrcRet                      = VERR_TIMEOUT;
 
     uint64_t tsStart                = RTTimeSystemMilliTS();
-    const uint64_t timeoutMs        = 600 * 1000;
+    const uint64_t cMsTimeout       = 10 * RT_MS_1MIN;
 
     AssertReturn(!pGuest.isNull(), VERR_TIMEOUT);
@@ -2703 +2702 @@
         if (RT_SUCCESS(vrc))
         {
+            Assert(!pSession.isNull());
+
             int vrcGuest = VERR_GSTCTL_GUEST_ERROR; /* unused. */
-
-            Assert(!pSession.isNull());
-
             vrc = pSession->i_startSession(&vrcGuest);
             if (RT_SUCCESS(vrc))
             {
+                /* Wait for VBoxService to start. */
                 GuestSessionWaitResult_T enmWaitResult = GuestSessionWaitResult_None;
-                int rcGuest = 0; /* unused. */
-
-                /* Wait for VBoxService to start. */
-                vrc = pSession->i_waitFor(GuestSessionWaitForFlag_Start, 100 /* timeout, ms */, enmWaitResult, &rcGuest);
+                int vrcGuest2 = VINF_SUCCESS; /* unused. */
+                vrc = pSession->i_waitFor(GuestSessionWaitForFlag_Start, 100 /* timeout, ms */, enmWaitResult, &vrcGuest2);
                 if (RT_SUCCESS(vrc))
                 {
                     vrc = pSession->Close();
-                    rc = 0;
+                    vrcRet = VINF_SUCCESS;
                     break;
                 }
@@ -2728 +2725 @@
         RTThreadSleep(100);
 
-    } while ((RTTimeSystemMilliTS() - tsStart) < timeoutMs);
-
-    return rc;
+    } while ((RTTimeSystemMilliTS() - tsStart) < cMsTimeout);
+
+    return vrcRet;
 }