Changeset 42693 in vbox for trunk/src/VBox

Timestamp:

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

Author:

vboxsync

Message:

Guest Control 2.0: Update.

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (3 diffs)
• Main/idl/VirtualBox.xidl (modified) (2 diffs)
• Main/include/GuestCtrlImplPrivate.h (modified) (1 diff)
• Main/include/GuestImpl.h (modified) (2 diffs)
• Main/include/GuestSessionImpl.h (modified) (5 diffs)
• Main/src-client/GuestCtrlImpl.cpp (modified) (4 diffs)
• Main/src-client/GuestDirectoryImpl.cpp (modified) (2 diffs)
• Main/src-client/GuestSessionImpl.cpp (modified) (14 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp

@@ -1659 +1659 @@
     {
 #ifndef VBOX_WITH_GUEST_CONTROL2
+        Assert(!fFlags);
         rc = pContext->pGuest->CopyToGuest(Bstr(pszFileSource).raw(), Bstr(pszFileDest).raw(),
                                            Bstr(pContext->strUsername).raw(), Bstr(pContext->strPassword).raw(),
                                            fFlags, pProgress.asOutParam());
 #else
-        Assert(!fFlags);
         SafeArray<CopyFileFlag_T> copyFlags;
         rc = pContext->pGuestSession->CopyTo(Bstr(pszFileSource).raw(), Bstr(pszFileDest).raw(),
@@ -1674 +1674 @@
     {
 #ifndef VBOX_WITH_GUEST_CONTROL2
+        Assert(!fFlags);
         rc = pContext->pGuest->CopyFromGuest(Bstr(pszFileSource).raw(), Bstr(pszFileDest).raw(),
                                              Bstr(pContext->strUsername).raw(), Bstr(pContext->strPassword).raw(),
                                              fFlags, pProgress.asOutParam());
 #else
-        Assert(!fFlags);
         SafeArray<CopyFileFlag_T> copyFlags;
         rc = pContext->pGuestSession->CopyFrom(Bstr(pszFileSource).raw(), Bstr(pszFileDest).raw(),
@@ -2809 +2809 @@
         HRESULT rc = S_OK;
         ComPtr<IProgress> pProgress;
+
+        SafeArray<AdditionsUpdateFlag_T> updateFlags;
         CHECK_ERROR(guest, UpdateGuestAdditions(Bstr(strSource).raw(),
                                                 /* Wait for whole update process to complete. */
-                                                AdditionsUpdateFlag_None,
+                                                ComSafeArrayAsInParam(updateFlags),
                                                 pProgress.asOutParam()));
         if (FAILED(rc))

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -10668 +10668 @@
   <interface
     name="IGuest" extends="$unknown"
-    uuid="9e0b07b1-490f-4413-8955-0a16515aac12"
+    uuid="19c32350-0618-4ede-b0c3-2b4311bf0d9b"
     wsmap="managed"
     >
@@ -11590 +11590 @@
         </desc>
       </param>
-      <param name="flags" type="unsigned long" dir="in">
+      <param name="flags" type="AdditionsUpdateFlag" dir="in" safearray="yes">
         <desc>
           <link to="AdditionsUpdateFlag"/> flags.

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

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

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

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

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

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

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

@@ -2649 +2649 @@
 }
 
-STDMETHODIMP Guest::UpdateGuestAdditions(IN_BSTR aSource, ULONG aFlags, IProgress **aProgress)
+STDMETHODIMP Guest::UpdateGuestAdditions(IN_BSTR aSource, ComSafeArrayIn(AdditionsUpdateFlag_T, aFlags), IProgress **aProgress)
 {
 #ifndef VBOX_WITH_GUEST_CONTROL
@@ -2661 +2661 @@
 
     /* Validate flags. */
+    uint32_t fFlags = AdditionsUpdateFlag_None;
     if (aFlags)
     {
-        if (!(aFlags & AdditionsUpdateFlag_WaitForUpdateStartOnly))
+        com::SafeArray<CopyFileFlag_T> flags(ComSafeArrayInArg(aFlags));
+        for (size_t i = 0; i < flags.size(); i++)
+            fFlags |= flags[i];
+    }
+
+    if (fFlags)
+    {
+        if (!(fFlags & AdditionsUpdateFlag_WaitForUpdateStartOnly))
             return setError(E_INVALIDARG, tr("Unknown flags (%#x)"), aFlags);
     }
@@ -2669 +2677 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    HRESULT rc = S_OK;
-
+    HRESULT hr = S_OK;
+#if 1
+    /* Create an anonymous session. This is required to run the Guest Additions
+     * update process with administrative rights. */
+    ComObjPtr<GuestSession> pSession;
+    int rc = sessionCreate("" /* User */, "" /* Password */, "" /* Domain */,
+                           "Updating Guest Additions" /* Name */, pSession);
+    if (RT_FAILURE(rc))
+    {
+        switch (rc)
+        {
+            case VERR_MAX_PROCS_REACHED:
+                hr = setError(VBOX_E_IPRT_ERROR, tr("Maximum number of guest sessions (%ld) reached"),
+                              VBOX_GUESTCTRL_MAX_SESSIONS);
+                break;
+
+            /** @todo Add more errors here. */
+
+           default:
+                hr = setError(VBOX_E_IPRT_ERROR, tr("Could not create guest session: %Rrc"), rc);
+                break;
+        }
+    }
+    else
+    {
+        AssertPtr(!pSession.isNull());
+        rc = pSession->queryInfo();
+        if (RT_FAILURE(rc))
+        {
+            hr = setError(VBOX_E_IPRT_ERROR, tr("Could not query guest session information: %Rrc"), rc);
+        }
+        else
+        {
+            ComObjPtr<Progress> pProgress;
+            SessionTaskUpdateAdditions *pTask = new SessionTaskUpdateAdditions(pSession /* GuestSession */,
+                                                                               Utf8Str(aSource), fFlags);
+            AssertPtrReturn(pTask, VERR_NO_MEMORY);
+            rc = pSession->startTaskAsync(tr("Updating Guest Additions"), pTask, pProgress);
+            if (RT_SUCCESS(rc))
+            {
+                /* Return progress to the caller. */
+                hr = pProgress.queryInterfaceTo(aProgress);
+            }
+            else
+                hr = setError(VBOX_E_IPRT_ERROR,
+                              tr("Starting task for updating Guest Additions on the guest failed: %Rrc"), rc);
+        }
+    }
+#else /* Legacy, can be removed later. */
     ComObjPtr<Progress> progress;
     try
@@ -2709 +2764 @@
     }
     return rc;
+#endif
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }

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

@@ -165 +165 @@
     LogFlowThisFunc(("cbStream=%RU32\n", mData.mStream.GetSize()));
 
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
     int rc;
     do
@@ -209 +211 @@
     Assert(!pProcess.isNull());
 
-    HRESULT hr = S_OK;
-
-    int rc;
     GuestProcessStreamBlock streamBlock;
-
-    /** @todo Make use of exceptions! */
-
-    try
-    {
-        GuestFsObjData objData;
-
-        AutoWriteLock rlock(this COMMA_LOCKVAL_SRC_POS);
-
-        rc = parseData(streamBlock);
-        if (   RT_FAILURE(rc)
-            || streamBlock.IsEmpty()) /* More data needed. */
-        {
-            rlock.release();
-
-            rc = pProcess->waitForStart(30 * 1000 /* Timeout */);
+    GuestFsObjData objData;
+
+    int rc = parseData(streamBlock);
+    if (   RT_FAILURE(rc)
+        || streamBlock.IsEmpty()) /* More data needed. */
+    {
+        rc = pProcess->waitForStart(30 * 1000 /* 30s timeout */);
+    }
+
+    if (RT_SUCCESS(rc))
+    {
+        BYTE byBuf[_64K];
+        size_t cbRead = 0;
+
+        /** @todo Merge with GuestSession::queryFileInfoInternal. */
+        for (;RT_SUCCESS(rc);)
+        {
+            GuestProcessWaitResult waitRes;
+            rc = pProcess->waitFor(  ProcessWaitForFlag_Terminate
+                                   | ProcessWaitForFlag_StdOut,
+                                   30 * 1000 /* Timeout */, waitRes);
+            if (   RT_FAILURE(rc)
+                || waitRes.mResult == ProcessWaitResult_Terminate
+                || waitRes.mResult == ProcessWaitResult_Error
+                || waitRes.mResult == ProcessWaitResult_Timeout)
+            {
+                rc = waitRes.mRC;
+                break;
+            }
+
+            rc = pProcess->readData(OUTPUT_HANDLE_ID_STDOUT, sizeof(byBuf),
+                                    30 * 1000 /* Timeout */, byBuf, sizeof(byBuf),
+                                    &cbRead);
             if (RT_FAILURE(rc))
-                return setError(VBOX_E_IPRT_ERROR,
-                                tr("Could not start reading directory \"%s\": %Rrc"),
-                                mData.mName.c_str(), rc);
-            BYTE byBuf[_64K];
-            size_t cbRead = 0;
-
-            /** @todo Merge with GuestSession::queryFileInfoInternal. */
-            for (;;)
+                break;
+
+            if (cbRead)
             {
-                GuestProcessWaitResult waitRes;
-                rc = pProcess->waitFor(  ProcessWaitForFlag_Terminate
-                                       | ProcessWaitForFlag_StdOut,
-                                       30 * 1000 /* Timeout */, waitRes);
-                if (   RT_FAILURE(rc)
-                    || waitRes.mResult == ProcessWaitResult_Terminate
-                    || waitRes.mResult == ProcessWaitResult_Error
-                    || waitRes.mResult == ProcessWaitResult_Timeout)
+                AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+                rc = mData.mStream.AddData(byBuf, cbRead);
+                if (RT_FAILURE(rc))
+                    break;
+
+                LogFlowThisFunc(("rc=%Rrc, cbRead=%RU64, cbStreamOut=%RU32\n",
+                                 rc, cbRead, mData.mStream.GetSize()));
+
+                rc = parseData(streamBlock);
+                if (RT_SUCCESS(rc))
                 {
+                    /* Parsing the current stream block succeeded so
+                     * we don't need more at the moment. */
                     break;
                 }
-
-                rc = pProcess->readData(OUTPUT_HANDLE_ID_STDOUT, sizeof(byBuf),
-                                        30 * 1000 /* Timeout */, byBuf, sizeof(byBuf),
-                                        &cbRead);
-                if (RT_FAILURE(rc))
-                    break;
-
-                if (cbRead)
+            }
+        }
+
+        LogFlowThisFunc(("Reading done with rc=%Rrc, cbRead=%RU64, cbStream=%RU32\n",
+                         rc, cbRead, mData.mStream.GetSize()));
+
+        if (RT_SUCCESS(rc))
+        {
+            rc = parseData(streamBlock);
+            if (rc == VERR_NO_DATA) /* Since this is the last parsing call, this is ok. */
+                rc = VINF_SUCCESS;
+        }
+
+        /*
+         * Note: The guest process can still be around to serve the next
+         *       upcoming stream block next time.
+         */
+        if (RT_SUCCESS(rc))
+        {
+            /** @todo Move into common function. */
+            ProcessStatus_T procStatus = ProcessStatus_Undefined;
+            LONG exitCode = 0;
+
+            HRESULT hr2 = pProcess->COMGETTER(Status(&procStatus));
+            ComAssertComRC(hr2);
+            hr2 = pProcess->COMGETTER(ExitCode(&exitCode));
+            ComAssertComRC(hr2);
+
+            if (   (   procStatus != ProcessStatus_Started
+                    && procStatus != ProcessStatus_Paused
+                    && procStatus != ProcessStatus_Terminating
+                   )
+                && exitCode != 0)
+            {
+                rc = VERR_ACCESS_DENIED;
+            }
+        }
+    }
+
+    if (RT_SUCCESS(rc))
+    {
+        if (streamBlock.GetCount()) /* Did we get content? */
+        {
+            rc = objData.FromLs(streamBlock);
+            if (RT_FAILURE(rc))
+                rc = VERR_PATH_NOT_FOUND;
+
+            if (RT_SUCCESS(rc))
+            {
+                /* Create the object. */
+                ComObjPtr<GuestFsObjInfo> pFsObjInfo;
+                HRESULT hr2 = pFsObjInfo.createObject();
+                if (FAILED(hr2))
+                    rc = VERR_COM_UNEXPECTED;
+
+                if (RT_SUCCESS(rc))
+                    rc = pFsObjInfo->init(objData);
+
+                if (RT_SUCCESS(rc))
                 {
-                    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-                    rc = mData.mStream.AddData(byBuf, cbRead);
-                    if (RT_FAILURE(rc))
-                        break;
-
-                    LogFlowThisFunc(("rc=%Rrc, cbRead=%RU64, cbStreamOut=%RU32\n",
-                                     rc, cbRead, mData.mStream.GetSize()));
-
-                    rc = parseData(streamBlock);
-                    if (RT_SUCCESS(rc))
-                    {
-                        /* Parsing the current stream block succeeded so
-                         * we don't need more at the moment. */
-                        break;
-                    }
+                    /* Return info object to the caller. */
+                    hr2 = pFsObjInfo.queryInterfaceTo(aInfo);
+                    if (FAILED(hr2))
+                        rc = VERR_COM_UNEXPECTED;
                 }
             }
-
-            LogFlowThisFunc(("Reading done with rc=%Rrc, cbRead=%RU64, cbStream=%RU32\n",
-                             rc, cbRead, mData.mStream.GetSize()));
-
-            if (RT_SUCCESS(rc))
-            {
-                rc = parseData(streamBlock);
-                if (rc == VERR_NO_DATA) /* Since this is the last parsing call, this is ok. */
-                    rc = VINF_SUCCESS;
-            }
-
-            /*
-             * Note: The guest process can still be around to serve the next
-             *       upcoming stream block next time.
-             */
-            if (RT_SUCCESS(rc))
-            {
-                /** @todo Move into common function. */
-                ProcessStatus_T procStatus = ProcessStatus_Undefined;
-                LONG exitCode = 0;
-
-                HRESULT hr = pProcess->COMGETTER(Status(&procStatus));
-                ComAssertComRC(hr);
-                hr = pProcess->COMGETTER(ExitCode(&exitCode));
-                ComAssertComRC(hr);
-
-                if (   (   procStatus != ProcessStatus_Started
-                        && procStatus != ProcessStatus_Paused
-                        && procStatus != ProcessStatus_Terminating
-                       )
-                    && exitCode != 0)
-                {
-                    return setError(VBOX_E_IPRT_ERROR,
-                                    tr("Reading directory \"%s\" failed: Unable to read / access denied"),
-                                    mData.mName.c_str(), exitCode); /**@todo Add stringify methods! */
-                }
-            }
-        }
-
-        if (RT_SUCCESS(rc))
-        {
-            if (streamBlock.GetCount()) /* Did we get content? */
-            {
-                rc = objData.FromLs(streamBlock);
-                if (RT_FAILURE(rc))
-                    return setError(VBOX_E_IPRT_ERROR,
-                                    tr("Reading directory \"%s\" failed: Path not found"),
-                                    mData.mName.c_str());
-
-                /* Create the object. */
-                ComObjPtr<GuestFsObjInfo> pFsObjInfo;
-                hr = pFsObjInfo.createObject();
-                if (FAILED(hr)) throw VERR_COM_UNEXPECTED;
-
-                rc = pFsObjInfo->init(objData);
-                if (RT_FAILURE(rc)) throw rc;
-
-                /* Return info object to the caller. */
-                hr = pFsObjInfo.queryInterfaceTo(aInfo);
-                if (FAILED(hr)) throw VERR_COM_UNEXPECTED;
-            }
-            else
-            {
-                /* Nothing to read anymore. Tell the caller. */
+        }
+        else
+        {
+            /* Nothing to read anymore. Tell the caller. */
+            rc = VERR_NO_MORE_FILES;
+        }
+    }
+
+    HRESULT hr = S_OK;
+
+    if (RT_FAILURE(rc)) /** @todo Add more errors here. */
+    {
+        switch (rc)
+        {
+            case VERR_ACCESS_DENIED:
+                hr = setError(VBOX_E_IPRT_ERROR, tr("Reading directory \"%s\" failed: Unable to read / access denied"),
+                              mData.mName.c_str());
+                break;
+
+            case VERR_PATH_NOT_FOUND:
+                hr = setError(VBOX_E_IPRT_ERROR, tr("Reading directory \"%s\" failed: Path not found"),
+                              mData.mName.c_str());
+                break;
+
+            case VERR_NO_MORE_FILES:
                 hr = setError(VBOX_E_OBJECT_NOT_FOUND, tr("No more entries for directory \"%s\""),
                               mData.mName.c_str());
-            }
-        }
-    }
-    catch (int rc2)
-    {
-        rc = rc2;
-    }
-
-    if (RT_FAILURE(rc)) /** @todo Add more errors here. */
-        hr = setError(VBOX_E_IPRT_ERROR, tr("Error while reading directory \"%s\": %Rrc\n"),
-                      mData.mName.c_str(), rc);
+                break;
+
+            default:
+                hr = setError(VBOX_E_IPRT_ERROR, tr("Error while reading directory \"%s\": %Rrc\n"),
+                              mData.mName.c_str(), rc);
+                break;
+        }
+    }
 
     LogFlowFuncLeaveRC(rc);

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

@@ -33 +33 @@
 #include <iprt/env.h>
 #include <iprt/file.h> /* For CopyTo/From. */
+#include <iprt/isofs.h> /* For UpdateAdditions. */
 
 #include <VBox/com/array.h>
@@ -109 +110 @@
 }
 
-int GuestSessionTask::setProgressErrorMsg(HRESULT hr, const Utf8Str &strMsg)
+HRESULT GuestSessionTask::setProgressErrorMsg(HRESULT hr, const Utf8Str &strMsg)
 {
     if (mProgress.isNull()) /* Progress is optional. */
-        return VINF_SUCCESS;
+        return hr; /* Return original rc. */
 
     BOOL fCanceled;
@@ -126 +127 @@
                                                strMsg.c_str());
         if (FAILED(hr2))
-            return VERR_COM_UNEXPECTED;
-    }
-    return VINF_SUCCESS;
+            return hr2;
+    }
+    return hr; /* Return original rc. */
 }
 
 SessionTaskCopyTo::SessionTaskCopyTo(GuestSession *pSession,
                                      const Utf8Str &strSource, const Utf8Str &strDest, uint32_t uFlags)
-                                     : GuestSessionTask(pSession)
+                                     : mSourceFile(NULL),
+                                       mSourceOffset(0),
+                                       mSourceSize(0),
+                                       GuestSessionTask(pSession)
 {
     mSource = strSource;
@@ -140 +144 @@
 }
 
+SessionTaskCopyTo::SessionTaskCopyTo(GuestSession *pSession,
+                                     PRTFILE pSourceFile, size_t cbSourceOffset, size_t cbSourceSize,
+                                     const Utf8Str &strDest, uint32_t uFlags)
+                                     : GuestSessionTask(pSession)
+{
+    mSourceFile    = pSourceFile;
+    mSourceOffset  = cbSourceOffset;
+    mSourceSize    = cbSourceSize;
+    mDest          = strDest;
+    mCopyFileFlags = uFlags;
+}
+
 SessionTaskCopyTo::~SessionTaskCopyTo(void)
 {
@@ -156 +172 @@
 
     if (mCopyFileFlags)
-        return setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                   Utf8StrFmt(GuestSession::tr("Copy flags (%#x) not implemented yet"),
-                                              mCopyFileFlags));
+    {
+        setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                            Utf8StrFmt(GuestSession::tr("Copy flags (%#x) not implemented yet"),
+                            mCopyFileFlags));
+        return VERR_INVALID_PARAMETER;
+    }
+
     int rc;
 
-    /** @todo Make use of exceptions (+ finally block) here! */
-
-    try
+    RTFILE fileLocal;
+    PRTFILE pFile = &fileLocal;
+
+    if (!mSourceFile)
     {
         /* Does our source file exist? */
@@ -174 +195 @@
         else
         {
-            RTFILE fileSource;
-            rc = RTFileOpen(&fileSource, mSource.c_str(),
+            rc = RTFileOpen(pFile, mSource.c_str(),
                             RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE);
             if (RT_FAILURE(rc))
             {
                 rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                         Utf8StrFmt(GuestSession::tr("Could not open source file \"%s\" for reading (%Rrc)"),
+                                         Utf8StrFmt(GuestSession::tr("Could not open source file \"%s\" for reading: %Rrc"),
                                                     mSource.c_str(), rc));
             }
             else
             {
-                uint64_t cbFileSize;
-                rc = RTFileGetSize(fileSource, &cbFileSize);
+                rc = RTFileGetSize(*pFile, &mSourceSize);
                 if (RT_FAILURE(rc))
                 {
@@ -193 +212 @@
                                                    mSource.c_str(), rc));
                 }
-                else
+            }
+        }
+    }
+    else
+    {
+        pFile = mSourceFile;
+        /* Size + offset are optional. */
+    }
+
+    GuestProcessStartupInfo procInfo;
+    procInfo.mName    = Utf8StrFmt(GuestSession::tr("Copying file \"%s\" to the guest to \"%s\" (%RU64 bytes)"),
+                                   mSource.c_str(), mDest.c_str(), mSourceSize);
+    procInfo.mCommand = Utf8Str(VBOXSERVICE_TOOL_CAT);
+    procInfo.mFlags   = ProcessCreateFlag_Hidden;
+
+    /* Set arguments.*/
+    procInfo.mArguments.push_back(Utf8StrFmt("--output=%s", mDest.c_str())); /** @todo Do we need path conversion? */
+
+    /* Startup process. */
+    ComObjPtr<GuestProcess> pProcess;
+    rc = pSession->processCreateExInteral(procInfo, pProcess);
+    if (RT_SUCCESS(rc))
+        rc = pProcess->startProcess();
+    if (RT_FAILURE(rc))
+    {
+        setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                            Utf8StrFmt(GuestSession::tr("Unable to start guest process: %Rrc"), rc));
+    }
+    else
+    {
+        GuestProcessWaitResult waitRes;
+        BYTE byBuf[_64K];
+
+        BOOL fCanceled = FALSE;
+        uint64_t cbWrittenTotal = 0;
+        uint64_t cbToRead = mSourceSize;
+
+        for (;;)
+        {
+            rc = pProcess->waitFor(ProcessWaitForFlag_StdIn,
+                                   30 * 1000 /* Timeout */, waitRes);
+            if (   RT_FAILURE(rc)
+                || waitRes.mResult == ProcessWaitResult_Terminate
+                || waitRes.mResult == ProcessWaitResult_Error
+                || waitRes.mResult == ProcessWaitResult_Timeout)
+            {
+                break;
+            }
+
+            size_t cbRead = 0;
+            if (mSourceSize) /* If we have nothing to write, take a shortcut. */
+            {
+                /** @todo Not very efficient, but works for now. */
+                rc = RTFileSeek(*pFile, mSourceOffset + cbWrittenTotal,
+                                RTFILE_SEEK_BEGIN, NULL /* poffActual */);
+                if (RT_SUCCESS(rc))
                 {
-                    GuestProcessStartupInfo procInfo;
-                    procInfo.mName    = Utf8StrFmt(GuestSession::tr("Copying file \"%s\" to the guest to \"%s\" (%RU64 bytes)"),
-                                                   mSource.c_str(), mDest.c_str(), cbFileSize);
-                    procInfo.mCommand = Utf8Str(VBOXSERVICE_TOOL_CAT);
-                    procInfo.mFlags   = ProcessCreateFlag_Hidden;
-
-                    /* Set arguments.*/
-                    procInfo.mArguments.push_back(Utf8StrFmt("--output=%s", mDest.c_str())); /** @todo Do we need path conversion? */
-
-                    /* Startup process. */
-                    ComObjPtr<GuestProcess> pProcess;
-                    rc = pSession->processCreateExInteral(procInfo, pProcess);
-                    if (RT_SUCCESS(rc))
-                        rc = pProcess->startProcess();
+                    rc = RTFileRead(*pFile, (uint8_t*)byBuf,
+                                    RT_MIN(cbToRead, sizeof(byBuf)), &cbRead);
+                    /*
+                     * Some other error occured? There might be a chance that RTFileRead
+                     * could not resolve/map the native error code to an IPRT code, so just
+                     * print a generic error.
+                     */
                     if (RT_FAILURE(rc))
                     {
                         setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                            Utf8StrFmt(GuestSession::tr("Unable to start guest process: %Rrc"), rc));
+                                            Utf8StrFmt(GuestSession::tr("Could not read from file \"%s\" (%Rrc)"),
+                                                       mSource.c_str(), rc));
+                        break;
                     }
+                }
+                else
+                {
+                    setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                        Utf8StrFmt(GuestSession::tr("Seeking file \"%s\" offset %RU64 failed: %Rrc"),
+                                                   mSource.c_str(), cbWrittenTotal, rc));
+                    break;
+                }
+            }
+
+            uint32_t fFlags = ProcessInputFlag_None;
+
+            /* Did we reach the end of the content we want to transfer (last chunk)? */
+            if (   (cbRead < sizeof(byBuf))
+                /* Did we reach the last block which is exactly _64K? */
+                || (cbToRead - cbRead == 0)
+                /* ... or does the user want to cancel? */
+                || (   SUCCEEDED(mProgress->COMGETTER(Canceled(&fCanceled)))
+                    && fCanceled)
+               )
+            {
+                fFlags |= ProcessInputFlag_EndOfFile;
+            }
+
+            uint32_t cbWritten;
+            Assert(sizeof(byBuf) >= cbRead);
+            rc = pProcess->writeData(0 /* StdIn */, fFlags,
+                                     byBuf, cbRead,
+                                     30 * 1000 /* Timeout */, &cbWritten);
+            if (RT_FAILURE(rc))
+            {
+                setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                    Utf8StrFmt(GuestSession::tr("Writing to file \"%s\" (offset %RU64) failed: %Rrc"),
+                                               mSource.c_str(), cbWrittenTotal, rc));
+                break;
+            }
+#ifdef DEBUG
+            LogFlowThisFunc(("cbWritten=%RU32, cbToRead=%RU64, cbWrittenTotal=%RU64, cbFileSize=%RU64\n",
+                             cbWritten, cbToRead - cbWritten, cbWrittenTotal + cbWritten, mSourceSize));
+#endif
+            /* Only subtract bytes reported written by the guest. */
+            Assert(cbToRead >= cbWritten);
+            cbToRead -= cbWritten;
+
+            /* Update total bytes written to the guest. */
+            cbWrittenTotal += cbWritten;
+            Assert(cbWrittenTotal <= mSourceSize);
+
+            /* Did the user cancel the operation above? */
+            if (fCanceled)
+                break;
+
+            /* Update the progress.
+             * Watch out for division by zero. */
+            mSourceSize > 0
+                ? rc = setProgress((ULONG)(cbWrittenTotal * 100 / mSourceSize))
+                : rc = setProgress(100);
+            if (RT_FAILURE(rc))
+                break;
+
+            /* End of file reached? */
+            if (!cbToRead)
+                break;
+        } /* for */
+
+        if (   !fCanceled
+            || RT_SUCCESS(rc))
+        {
+            /*
+             * Even if we succeeded until here make sure to check whether we really transfered
+             * everything.
+             */
+            if (   mSourceSize > 0
+                && cbWrittenTotal == 0)
+            {
+                /* If nothing was transfered but the file size was > 0 then "vbox_cat" wasn't able to write
+                 * to the destination -> access denied. */
+                rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                         Utf8StrFmt(GuestSession::tr("Access denied when copying file \"%s\" to \"%s\""),
+                                                    mSource.c_str(), mDest.c_str()));
+            }
+            else if (cbWrittenTotal < mSourceSize)
+            {
+                /* If we did not copy all let the user know. */
+                rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                         Utf8StrFmt(GuestSession::tr("Copying file \"%s\" failed (%RU64/%RU64 bytes transfered)"),
+                                                    mSource.c_str(), cbWrittenTotal, mSourceSize));
+            }
+            else
+            {
+                rc = pProcess->waitFor(ProcessWaitForFlag_Terminate,
+                                       30 * 1000 /* Timeout */, waitRes);
+                if (   RT_FAILURE(rc)
+                    || waitRes.mResult != ProcessWaitResult_Terminate)
+                {
+                    if (RT_FAILURE(rc))
+                        rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                                 Utf8StrFmt(GuestSession::tr("Waiting on termination for copying file \"%s\" failed: %Rrc"),
+                                                            mSource.c_str(), rc));
                     else
+                        rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                                 Utf8StrFmt(GuestSession::tr("Waiting on termination for copying file \"%s\" failed with wait result %ld"),
+                                                            mSource.c_str(), waitRes.mResult));
+                }
+
+                if (RT_SUCCESS(rc))
+                {
+                    ProcessStatus_T procStatus;
+                    LONG exitCode;
+                    if (   (   SUCCEEDED(pProcess->COMGETTER(Status(&procStatus)))
+                            && procStatus != ProcessStatus_TerminatedNormally)
+                        || (   SUCCEEDED(pProcess->COMGETTER(ExitCode(&exitCode)))
+                            && exitCode != 0)
+                       )
                     {
-                        GuestProcessWaitResult waitRes;
-                        BYTE byBuf[_64K];
-
-                        BOOL fCanceled = FALSE;
-                        uint64_t cbWrittenTotal = 0;
-                        uint64_t cbToRead = cbFileSize;
-
-                        for (;;)
-                        {
-                            rc = pProcess->waitFor(ProcessWaitForFlag_StdIn,
-                                                   30 * 1000 /* Timeout */, waitRes);
-                            if (   RT_FAILURE(rc)
-                                || waitRes.mResult == ProcessWaitResult_Terminate
-                                || waitRes.mResult == ProcessWaitResult_Error
-                                || waitRes.mResult == ProcessWaitResult_Timeout)
-                            {
-                                break;
-                            }
-
-                            size_t cbRead = 0;
-                            if (cbFileSize) /* If we have nothing to write, take a shortcut. */
-                            {
-                                /** @todo Not very efficient, but works for now. */
-                                rc = RTFileSeek(fileSource, cbWrittenTotal,
-                                                RTFILE_SEEK_BEGIN, NULL /* poffActual */);
-                                if (RT_SUCCESS(rc))
-                                {
-                                    rc = RTFileRead(fileSource, (uint8_t*)byBuf,
-                                                    RT_MIN(cbToRead, sizeof(byBuf)), &cbRead);
-                                    /*
-                                     * Some other error occured? There might be a chance that RTFileRead
-                                     * could not resolve/map the native error code to an IPRT code, so just
-                                     * print a generic error.
-                                     */
-                                    if (RT_FAILURE(rc))
-                                    {
-                                        setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                                            Utf8StrFmt(GuestSession::tr("Could not read from file \"%s\" (%Rrc)"),
-                                                                       mSource.c_str(), rc));
-                                        break;
-                                    }
-                                }
-                                else
-                                {
-                                    setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                                        Utf8StrFmt(GuestSession::tr("Seeking file \"%s\" offset %RU64 failed: %Rrc"),
-                                                                   mSource.c_str(), cbWrittenTotal, rc));
-                                    break;
-                                }
-                            }
-
-                            uint32_t fFlags = ProcessInputFlag_None;
-
-                            /* Did we reach the end of the content we want to transfer (last chunk)? */
-                            if (   (cbRead < sizeof(byBuf))
-                                /* Did we reach the last block which is exactly _64K? */
-                                || (cbToRead - cbRead == 0)
-                                /* ... or does the user want to cancel? */
-                                || (   SUCCEEDED(mProgress->COMGETTER(Canceled(&fCanceled)))
-                                    && fCanceled)
-                               )
-                            {
-                                fFlags |= ProcessInputFlag_EndOfFile;
-                            }
-
-                            uint32_t cbWritten;
-                            Assert(sizeof(byBuf) >= cbRead);
-                            rc = pProcess->writeData(0 /* StdIn */, fFlags,
-                                                     byBuf, cbRead,
-                                                     30 * 1000 /* Timeout */, &cbWritten);
-                            if (RT_FAILURE(rc))
-                            {
-                                setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                                    Utf8StrFmt(GuestSession::tr("Writing to file \"%s\" (offset %RU64) failed: %Rrc"),
-                                                               mSource.c_str(), cbWrittenTotal, rc));
-                                break;
-                            }
-#ifdef DEBUG
-                            LogFlowThisFunc(("cbWritten=%RU32, cbToRead=%RU64, cbWrittenTotal=%RU64, cbFileSize=%RU64\n",
-                                             cbWritten, cbToRead - cbWritten, cbWrittenTotal + cbWritten, cbFileSize));
-#endif
-                            /* Only subtract bytes reported written by the guest. */
-                            Assert(cbToRead >= cbWritten);
-                            cbToRead -= cbWritten;
-
-                            /* Update total bytes written to the guest. */
-                            cbWrittenTotal += cbWritten;
-                            Assert(cbWrittenTotal <= cbFileSize);
-
-                            /* Did the user cancel the operation above? */
-                            if (fCanceled)
-                                break;
-
-                            /* Update the progress.
-                             * Watch out for division by zero. */
-                            cbFileSize > 0
-                                ? rc = setProgress((ULONG)(cbWrittenTotal * 100 / cbFileSize))
-                                : rc = setProgress(100);
-                            if (RT_FAILURE(rc))
-                                break;
-
-                            /* End of file reached? */
-                            if (!cbToRead)
-                                break;
-                        } /* for */
-
-                        if (   !fCanceled
-                            || RT_SUCCESS(rc))
-                        {
-                            /*
-                             * Even if we succeeded until here make sure to check whether we really transfered
-                             * everything.
-                             */
-                            if (   cbFileSize > 0
-                                && cbWrittenTotal == 0)
-                            {
-                                /* If nothing was transfered but the file size was > 0 then "vbox_cat" wasn't able to write
-                                 * to the destination -> access denied. */
-                                rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                                         Utf8StrFmt(GuestSession::tr("Access denied when copying file \"%s\" to \"%s\""),
-                                                                    mSource.c_str(), mDest.c_str()));
-                            }
-                            else if (cbWrittenTotal < cbFileSize)
-                            {
-                                /* If we did not copy all let the user know. */
-                                rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                                         Utf8StrFmt(GuestSession::tr("Copying file \"%s\" failed (%RU64/%RU64 bytes transfered)"),
-                                                                    mSource.c_str(), cbWrittenTotal, cbFileSize));
-                            }
-                            else
-                            {
-                                rc = pProcess->waitFor(ProcessWaitForFlag_Terminate,
-                                                       30 * 1000 /* Timeout */, waitRes);
-                                if (   RT_FAILURE(rc)
-                                    || waitRes.mResult != ProcessWaitResult_Terminate)
-                                {
-                                    if (RT_FAILURE(rc))
-                                        rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                                                 Utf8StrFmt(GuestSession::tr("Waiting on termination for copying file \"%s\" failed: %Rrc"),
-                                                                            mSource.c_str(), rc));
-                                    else
-                                        rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                                                 Utf8StrFmt(GuestSession::tr("Waiting on termination for copying file \"%s\" failed with wait result %ld"),
-                                                                            mSource.c_str(), waitRes.mResult));
-                                }
-
-                                if (RT_SUCCESS(rc))
-                                {
-                                    ProcessStatus_T procStatus;
-                                    LONG exitCode;
-                                    if (   (   SUCCEEDED(pProcess->COMGETTER(Status(&procStatus)))
-                                            && procStatus != ProcessStatus_TerminatedNormally)
-                                        || (   SUCCEEDED(pProcess->COMGETTER(ExitCode(&exitCode)))
-                                            && exitCode != 0)
-                                       )
-                                    {
-                                        rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                                                 Utf8StrFmt(GuestSession::tr("Copying file \"%s\" failed with status %ld, exit code %ld"),
-                                                                            mSource.c_str(), procStatus, exitCode)); /**@todo Add stringify methods! */
-                                    }
-                                }
-
-                                if (RT_SUCCESS(rc))
-                                    rc = setProgressSuccess();
-                            }
-                        }
-
-                        pProcess->close();
-                    } /* processCreateExInteral */
-                } /* RTFileGetSize */
-
-                RTFileClose(fileSource);
-
-            } /* RTFileOpen */
-        } /* RTFileExists */
-    }
-    catch (int rc2)
-    {
-        rc = rc2;
-    }
+                        rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                                 Utf8StrFmt(GuestSession::tr("Copying file \"%s\" failed with status %ld, exit code %ld"),
+                                                            mSource.c_str(), procStatus, exitCode)); /**@todo Add stringify methods! */
+                    }
+                }
+
+                if (RT_SUCCESS(rc))
+                    rc = setProgressSuccess();
+            }
+        }
+
+        pProcess->close();
+    } /* processCreateExInteral */
+
+    if (!mSourceFile) /* Only close locally opened files. */
+        RTFileClose(*pFile);
 
     LogFlowFuncLeaveRC(rc);
@@ -450 +468 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    int rc;
-
-    /** @todo Make use of exceptions (+ finally block) here! */
-
-    try
-    {
-        /*
-         * Note: There will be races between querying file size + reading the guest file's
-         *       content because we currently *do not* lock down the guest file when doing the
-         *       actual operations.
-         ** @todo Implement guest file locking!
-         */
-        GuestFsObjData objData;
-        rc = pSession->fileQueryInfoInternal(Utf8Str(mSource), objData);
+    /*
+     * Note: There will be races between querying file size + reading the guest file's
+     *       content because we currently *do not* lock down the guest file when doing the
+     *       actual operations.
+     ** @todo Implement guest file locking!
+     */
+    GuestFsObjData objData;
+    int rc = pSession->fileQueryInfoInternal(Utf8Str(mSource), objData);
+    if (RT_FAILURE(rc))
+    {
+        setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                            Utf8StrFmt(GuestSession::tr("Querying guest file information for \"%s\" failed: %Rrc"),
+                            mSource.c_str(), rc));
+    }
+    else if (objData.mType != FsObjType_File) /* Only single files are supported at the moment. */
+    {
+        rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                 Utf8StrFmt(GuestSession::tr("Guest file \"%s\" is not a file"), mSource.c_str()));
+    }
+
+    if (RT_SUCCESS(rc))
+    {
+        RTFILE fileDest;
+        rc = RTFileOpen(&fileDest, mDest.c_str(),
+                        RTFILE_O_WRITE | RTFILE_O_OPEN_CREATE | RTFILE_O_DENY_WRITE); /** @todo Use the correct open modes! */
         if (RT_FAILURE(rc))
         {
             setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                Utf8StrFmt(GuestSession::tr("Querying guest file information for \"%s\" failed: %Rrc"),
-                                mSource.c_str(), rc));
-        }
-        else if (objData.mType != FsObjType_File) /* Only single files are supported at the moment. */
-        {
-            rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                     Utf8StrFmt(GuestSession::tr("Guest file \"%s\" is not a file"), mSource.c_str()));
-        }
-
-        if (RT_SUCCESS(rc))
-        {
-            RTFILE fileDest;
-            rc = RTFileOpen(&fileDest, mDest.c_str(),
-                            RTFILE_O_WRITE | RTFILE_O_OPEN_CREATE | RTFILE_O_DENY_WRITE); /** @todo Use the correct open modes! */
+                                Utf8StrFmt(GuestSession::tr("Error opening destination file \"%s\": %Rrc"),
+                                           mDest.c_str(), rc));
+        }
+        else
+        {
+            GuestProcessStartupInfo procInfo;
+            procInfo.mName    = Utf8StrFmt(GuestSession::tr("Copying file \"%s\" from guest to the host to \"%s\" (%RI64 bytes)"),
+                                                            mSource.c_str(), mDest.c_str(), objData.mObjectSize);
+            procInfo.mCommand   = Utf8Str(VBOXSERVICE_TOOL_CAT);
+            procInfo.mFlags     = ProcessCreateFlag_Hidden | ProcessCreateFlag_WaitForStdOut;
+
+            /* Set arguments.*/
+            procInfo.mArguments.push_back(mSource); /* Which file to output? */
+
+            /* Startup process. */
+            ComObjPtr<GuestProcess> pProcess;
+            rc = pSession->processCreateExInteral(procInfo, pProcess);
+            if (RT_SUCCESS(rc))
+                rc = pProcess->startProcess();
             if (RT_FAILURE(rc))
             {
                 setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                    Utf8StrFmt(GuestSession::tr("Error opening destination file \"%s\": %Rrc"),
-                                               mDest.c_str(), rc));
+                                    Utf8StrFmt(GuestSession::tr("Unable to start guest process: %Rrc"), rc));
             }
             else
             {
-                GuestProcessStartupInfo procInfo;
-                procInfo.mName    = Utf8StrFmt(GuestSession::tr("Copying file \"%s\" from guest to the host to \"%s\" (%RI64 bytes)"),
-                                                                mSource.c_str(), mDest.c_str(), objData.mObjectSize);
-                procInfo.mCommand   = Utf8Str(VBOXSERVICE_TOOL_CAT);
-                procInfo.mFlags     = ProcessCreateFlag_Hidden | ProcessCreateFlag_WaitForStdOut;
-
-                /* Set arguments.*/
-                procInfo.mArguments.push_back(mSource); /* Which file to output? */
-
-                /* Startup process. */
-                ComObjPtr<GuestProcess> pProcess;
-                rc = pSession->processCreateExInteral(procInfo, pProcess);
-                if (RT_SUCCESS(rc))
-                    rc = pProcess->startProcess();
-                if (RT_FAILURE(rc))
+                GuestProcessWaitResult waitRes;
+                BYTE byBuf[_64K];
+
+                BOOL fCanceled = FALSE;
+                uint64_t cbWrittenTotal = 0;
+                uint64_t cbToRead = objData.mObjectSize;
+
+                for (;;)
                 {
-                    setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                        Utf8StrFmt(GuestSession::tr("Unable to start guest process: %Rrc"), rc));
-                }
-                else
-                {
-                    GuestProcessWaitResult waitRes;
-                    BYTE byBuf[_64K];
-
-                    BOOL fCanceled = FALSE;
-                    uint64_t cbWrittenTotal = 0;
-                    uint64_t cbToRead = objData.mObjectSize;
-
-                    for (;;)
+                    rc = pProcess->waitFor(ProcessWaitForFlag_StdOut,
+                                           30 * 1000 /* Timeout */, waitRes);
+                    if (   RT_FAILURE(rc)
+                        || waitRes.mResult != ProcessWaitResult_StdOut)
                     {
-                        rc = pProcess->waitFor(ProcessWaitForFlag_StdOut,
-                                               30 * 1000 /* Timeout */, waitRes);
-                        if (   RT_FAILURE(rc)
-                            || waitRes.mResult != ProcessWaitResult_StdOut)
-                        {
-                            break;
-                        }
-
-                        size_t cbRead;
-                        rc = pProcess->readData(OUTPUT_HANDLE_ID_STDOUT, sizeof(byBuf),
-                                                30 * 1000 /* Timeout */, byBuf, sizeof(byBuf),
-                                                &cbRead);
+                        break;
+                    }
+
+                    size_t cbRead;
+                    rc = pProcess->readData(OUTPUT_HANDLE_ID_STDOUT, sizeof(byBuf),
+                                            30 * 1000 /* Timeout */, byBuf, sizeof(byBuf),
+                                            &cbRead);
+                    if (RT_FAILURE(rc))
+                    {
+                        setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                            Utf8StrFmt(GuestSession::tr("Reading from file \"%s\" (offset %RU64) failed: %Rrc"),
+                                            mSource.c_str(), cbWrittenTotal, rc));
+                        break;
+                    }
+
+                    if (cbRead)
+                    {
+                        rc = RTFileWrite(fileDest, byBuf, cbRead, NULL /* No partial writes */);
                         if (RT_FAILURE(rc))
                         {
                             setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                                Utf8StrFmt(GuestSession::tr("Reading from file \"%s\" (offset %RU64) failed: %Rrc"),
-                                                mSource.c_str(), cbWrittenTotal, rc));
+                                                Utf8StrFmt(GuestSession::tr("Error writing to file \"%s\" (%RU64 bytes left): %Rrc"),
+                                                mDest.c_str(), cbToRead, rc));
                             break;
                         }
 
-                        if (cbRead)
+                        /* Only subtract bytes reported written by the guest. */
+                        Assert(cbToRead >= cbRead);
+                        cbToRead -= cbRead;
+
+                        /* Update total bytes written to the guest. */
+                        cbWrittenTotal += cbRead;
+                        Assert(cbWrittenTotal <= (uint64_t)objData.mObjectSize);
+
+                        /* Did the user cancel the operation above? */
+                        if (   SUCCEEDED(mProgress->COMGETTER(Canceled(&fCanceled)))
+                            && fCanceled)
+                            break;
+
+                        rc = setProgress((ULONG)(cbWrittenTotal / ((uint64_t)objData.mObjectSize / 100.0)));
+                        if (RT_FAILURE(rc))
+                            break;
+
+                        /* End of file reached? */
+                        if (cbToRead == 0)
+                            break;
+                    }
+                } /* for */
+
+                if (   !fCanceled
+                    || RT_SUCCESS(rc))
+                {
+                    /*
+                     * Even if we succeeded until here make sure to check whether we really transfered
+                     * everything.
+                     */
+                    if (   objData.mObjectSize > 0
+                        && cbWrittenTotal == 0)
+                    {
+                        /* If nothing was transfered but the file size was > 0 then "vbox_cat" wasn't able to write
+                         * to the destination -> access denied. */
+                        rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                                 Utf8StrFmt(GuestSession::tr("Access denied when copying file \"%s\" to \"%s\""),
+                                                 mSource.c_str(), mDest.c_str()));
+                    }
+                    else if (cbWrittenTotal < (uint64_t)objData.mObjectSize)
+                    {
+                        /* If we did not copy all let the user know. */
+                        rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                                 Utf8StrFmt(GuestSession::tr("Copying file \"%s\" failed (%RU64/%RU64 bytes transfered)"),
+                                                 mSource.c_str(), cbWrittenTotal, objData.mObjectSize));
+                    }
+                    else
+                    {
+                        ProcessStatus_T procStatus;
+                        LONG exitCode;
+                        if (   (   SUCCEEDED(pProcess->COMGETTER(Status(&procStatus)))
+                                && procStatus != ProcessStatus_TerminatedNormally)
+                            || (   SUCCEEDED(pProcess->COMGETTER(ExitCode(&exitCode)))
+                                && exitCode != 0)
+                           )
                         {
-                            rc = RTFileWrite(fileDest, byBuf, cbRead, NULL /* No partial writes */);
-                            if (RT_FAILURE(rc))
-                            {
-                                setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                                    Utf8StrFmt(GuestSession::tr("Error writing to file \"%s\" (%RU64 bytes left): %Rrc"),
-                                                    mDest.c_str(), cbToRead, rc));
-                                break;
-                            }
-
-                            /* Only subtract bytes reported written by the guest. */
-                            Assert(cbToRead >= cbRead);
-                            cbToRead -= cbRead;
-
-                            /* Update total bytes written to the guest. */
-                            cbWrittenTotal += cbRead;
-                            Assert(cbWrittenTotal <= (uint64_t)objData.mObjectSize);
-
-                            /* Did the user cancel the operation above? */
-                            if (   SUCCEEDED(mProgress->COMGETTER(Canceled(&fCanceled)))
-                                && fCanceled)
-                                break;
-
-                            rc = setProgress((ULONG)(cbWrittenTotal / ((uint64_t)objData.mObjectSize / 100.0)));
-                            if (RT_FAILURE(rc))
-                                break;
-
-                            /* End of file reached? */
-                            if (cbToRead == 0)
-                                break;
+                            rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                                     Utf8StrFmt(GuestSession::tr("Copying file \"%s\" failed with status %ld, exit code %d"),
+                                                                mSource.c_str(), procStatus, exitCode)); /**@todo Add stringify methods! */
                         }
-                    } /* for */
-
-                    if (   !fCanceled
-                        || RT_SUCCESS(rc))
-                    {
-                        /*
-                         * Even if we succeeded until here make sure to check whether we really transfered
-                         * everything.
-                         */
-                        if (   objData.mObjectSize > 0
-                            && cbWrittenTotal == 0)
-                        {
-                            /* If nothing was transfered but the file size was > 0 then "vbox_cat" wasn't able to write
-                             * to the destination -> access denied. */
-                            rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                                     Utf8StrFmt(GuestSession::tr("Access denied when copying file \"%s\" to \"%s\""),
-                                                     mSource.c_str(), mDest.c_str()));
-                        }
-                        else if (cbWrittenTotal < (uint64_t)objData.mObjectSize)
-                        {
-                            /* If we did not copy all let the user know. */
-                            rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                                     Utf8StrFmt(GuestSession::tr("Copying file \"%s\" failed (%RU64/%RU64 bytes transfered)"),
-                                                     mSource.c_str(), cbWrittenTotal, objData.mObjectSize));
-                        }
-                        else
-                        {
-                            ProcessStatus_T procStatus;
-                            LONG exitCode;
-                            if (   (   SUCCEEDED(pProcess->COMGETTER(Status(&procStatus)))
-                                    && procStatus != ProcessStatus_TerminatedNormally)
-                                || (   SUCCEEDED(pProcess->COMGETTER(ExitCode(&exitCode)))
-                                    && exitCode != 0)
-                               )
-                            {
-                                rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                                         Utf8StrFmt(GuestSession::tr("Copying file \"%s\" failed with status %ld, exit code %d"),
-                                                                    mSource.c_str(), procStatus, exitCode)); /**@todo Add stringify methods! */
-                            }
-                            else /* Yay, success! */
-                                rc = setProgressSuccess();
-                        }
+                        else /* Yay, success! */
+                            rc = setProgressSuccess();
                     }
-
-                    pProcess->close();
                 }
 
-                RTFileClose(fileDest);
+                pProcess->close();
             }
-        }
-    }
-    catch (int rc2)
-    {
-        rc = rc2;
+
+            RTFileClose(fileDest);
+        }
     }
 
@@ -650 +657 @@
 {
     std::auto_ptr<SessionTaskCopyFrom> task(static_cast<SessionTaskCopyFrom*>(pvUser));
+    AssertReturn(task.get(), VERR_GENERAL_FAILURE);
+
+    LogFlowFunc(("pTask=%p\n", task.get()));
+    return task->Run();
+}
+
+SessionTaskUpdateAdditions::SessionTaskUpdateAdditions(GuestSession *pSession,
+                                                       const Utf8Str &strSource, uint32_t uFlags)
+                                                       : GuestSessionTask(pSession)
+{
+    mSource = strSource;
+    mFlags  = uFlags;
+}
+
+SessionTaskUpdateAdditions::~SessionTaskUpdateAdditions(void)
+{
+
+}
+
+int SessionTaskUpdateAdditions::Run(void)
+{
+    LogFlowThisFuncEnter();
+
+    ComObjPtr<GuestSession> pSession = mSession;
+    Assert(!pSession.isNull());
+
+    AutoCaller autoCaller(pSession);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    int rc = setProgress(10);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    HRESULT hr = S_OK;
+
+    LogRel(("Automatic update of Guest Additions started, using \"%s\"\n", mSource.c_str()));
+
+    /*
+     * Determine guest OS type and the required installer image.
+     * At the moment only Windows guests are supported.
+     */
+    Utf8Str strInstallerImage;
+
+    ComObjPtr<Guest> pGuest(mSession->getParent());
+    Bstr osTypeId;
+    if (   SUCCEEDED(pGuest->COMGETTER(OSTypeId(osTypeId.asOutParam())))
+        && !osTypeId.isEmpty())
+    {
+        Utf8Str osTypeIdUtf8(osTypeId); /* Needed for .contains(). */
+        if (   osTypeIdUtf8.contains("Microsoft", Utf8Str::CaseInsensitive)
+            || osTypeIdUtf8.contains("Windows", Utf8Str::CaseInsensitive))
+        {
+            if (osTypeIdUtf8.contains("64", Utf8Str::CaseInsensitive))
+                strInstallerImage = "VBOXWINDOWSADDITIONS_AMD64.EXE";
+            else
+                strInstallerImage = "VBOXWINDOWSADDITIONS_X86.EXE";
+            /* Since the installers are located in the root directory,
+             * no further path processing needs to be done (yet). */
+        }
+        else /* Everything else is not supported (yet). */
+        {
+            hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                     Utf8StrFmt(GuestSession::tr("Detected guest OS (%s) does not support automatic Guest Additions updating, please update manually"),
+                                     osTypeIdUtf8.c_str()));
+            rc = VERR_GENERAL_FAILURE; /* Fudge. */
+        }
+    }
+    else
+    {
+        hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                 Utf8StrFmt(GuestSession::tr("Could not detected guest OS type/version, please update manually")));
+        rc = VERR_GENERAL_FAILURE; /* Fudge. */
+    }
+
+    RTISOFSFILE iso;
+    uint32_t cbOffset;
+    size_t cbSize;
+
+    if (RT_SUCCESS(rc))
+    {
+        Assert(!strInstallerImage.isEmpty());
+
+        /*
+         * Try to open the .ISO file and locate the specified installer.
+         */
+        rc = RTIsoFsOpen(&iso, mSource.c_str());
+        if (RT_FAILURE(rc))
+        {
+            hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                     Utf8StrFmt(GuestSession::tr("Invalid installation medium \"%s\" detected: %Rrc"),
+                                     mSource.c_str(), rc));
+        }
+        else
+        {
+            rc = RTIsoFsGetFileInfo(&iso, strInstallerImage.c_str(), &cbOffset, &cbSize);
+            if (   RT_SUCCESS(rc)
+                && cbOffset
+                && cbSize)
+            {
+                rc = RTFileSeek(iso.file, cbOffset, RTFILE_SEEK_BEGIN, NULL);
+                if (RT_FAILURE(rc))
+                    hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                             Utf8StrFmt(GuestSession::tr("Could not seek to setup file on installation medium \"%s\": %Rrc"),
+                                             mSource.c_str(), rc));
+            }
+            else
+            {
+                switch (rc)
+                {
+                    case VERR_FILE_NOT_FOUND:
+                        hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                                 Utf8StrFmt(GuestSession::tr("Setup file was not found on installation medium \"%s\""),
+                                                 mSource.c_str()));
+                        break;
+
+                    default:
+                        hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                                 Utf8StrFmt(GuestSession::tr("An unknown error (%Rrc) occured while retrieving information of setup file on installation medium \"%s\""),
+                                                 rc, mSource.c_str()));
+                        break;
+                }
+            }
+
+            /* Specify the ouput path on the guest side. */
+            /** @todo Add support for non-Windows as well! */
+            Utf8Str strInstallerDest = "%TEMP%\\VBoxWindowsAdditions.exe";
+
+            /* Copy over the Guest Additions installer to the guest. */
+            if (RT_SUCCESS(rc))
+            {
+                LogRel(("Copying Guest Additions installer \"%s\" to \"%s\" on guest ...\n",
+                        strInstallerImage.c_str(), strInstallerDest.c_str()));
+
+                rc = setProgress(15);
+                if (RT_SUCCESS(rc))
+                {
+                    SessionTaskCopyTo *pTask = new SessionTaskCopyTo(pSession /* GuestSession */,
+                                                                     &iso.file, cbOffset, cbSize,
+                                                                     strInstallerDest, CopyFileFlag_None);
+                    AssertPtrReturn(pTask, VERR_NO_MEMORY);
+
+                    ComObjPtr<Progress> pProgressCopyTo;
+                    rc = pSession->startTaskAsync(Utf8StrFmt(GuestSession::tr("Copying Guest Additions installer from \"%s\" to \"%s\" on the guest"),
+                                                             mSource.c_str(), strInstallerDest.c_str()),
+                                                  pTask, pProgressCopyTo);
+                    if (RT_FAILURE(rc))
+                    {
+                        hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                                 Utf8StrFmt(GuestSession::tr("Unable to start copying Guest Additions installer \"%s\" to \"%s\": %Rrc"),
+                                                 mSource.c_str(), strInstallerDest.c_str(), rc));
+                    }
+                    else
+                    {
+                        BOOL fCanceled = FALSE;
+                        hr = pProgressCopyTo->WaitForCompletion(-1);
+                        if (SUCCEEDED(hr))
+                        {
+                            rc = setProgress(20);
+                        }
+                        else if (   SUCCEEDED(pProgressCopyTo->COMGETTER(Canceled)(&fCanceled))
+                                 && fCanceled)
+                        {
+                            hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                                     Utf8StrFmt(GuestSession::tr("Copying Guest Additions installer \"%s\" to \"%s\" was canceled"),
+                                                     mSource.c_str(), strInstallerDest.c_str(), hr));
+                            rc = VERR_GENERAL_FAILURE; /* Fudge. */
+                        }
+                        else
+                        {
+                            Assert(FAILED(hr));
+                            hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                                     Utf8StrFmt(GuestSession::tr("Error while copying Guest Additions installer \"%s\" to \"%s\": %Rhrc"),
+                                                     mSource.c_str(), strInstallerDest.c_str(), hr));
+                            rc = VERR_GENERAL_FAILURE; /* Fudge. */
+                        }
+                    }
+                }
+            }
+
+            if (RT_SUCCESS(rc))
+            {
+                /* Install needed certificates for the WHQL crap. */
+                /** @todo Copy over VBoxCertUtil? */
+                rc = setProgress(25);
+            }
+
+            if (RT_SUCCESS(rc))
+            {
+                /*
+                 * Installer was transferred successfully, so let's start it
+                 * (with system rights).
+                 */
+                LogRel(("Starting Guest Additions installer ...\n"));
+                rc = setProgress(60);
+            }
+
+            if (RT_SUCCESS(rc))
+            {
+                GuestProcessStartupInfo procInfo;
+                procInfo.mName    = Utf8StrFmt(GuestSession::tr("Guest Additions Setup"));
+                procInfo.mCommand = Utf8Str(strInstallerDest);
+                procInfo.mFlags   = ProcessCreateFlag_Hidden;
+                /* If the caller does not want to wait for out guest update process to end,
+                 * complete the progress object now so that the caller can do other work. */
+                if (mFlags & AdditionsUpdateFlag_WaitForUpdateStartOnly)
+                    procInfo.mFlags |= ProcessCreateFlag_WaitForProcessStartOnly;
+
+                /* Construct arguments. */
+                procInfo.mArguments.push_back(Utf8Str("/S")); /* We want to install in silent mode. */
+                procInfo.mArguments.push_back(Utf8Str("/l")); /* ... and logging enabled. */
+                /* Don't quit VBoxService during upgrade because it still is used for this
+                 * piece of code we're in right now (that is, here!) ... */
+                procInfo.mArguments.push_back(Utf8Str("/no_vboxservice_exit"));
+                /* Tell the installer to report its current installation status
+                 * using a running VBoxTray instance via balloon messages in the
+                 * Windows taskbar. */
+                procInfo.mArguments.push_back(Utf8Str("/post_installstatus"));
+
+                ComObjPtr<GuestProcess> pProcess;
+                rc = pSession->processCreateExInteral(procInfo, pProcess);
+                if (RT_SUCCESS(rc))
+                    rc = pProcess->startProcess();
+                if (RT_SUCCESS(rc))
+                    rc = setProgress(65);
+                if (RT_SUCCESS(rc))
+                {
+                    LogRel(("Updating Guest Additions in progress ...\n"));
+
+                    GuestProcessWaitResult waitRes;
+                    rc = pProcess->waitFor(ProcessWaitForFlag_Terminate,
+                                           10 * 60 * 1000 /* 10 mins Timeout */, waitRes);
+                    if (waitRes.mResult == ProcessWaitResult_Terminate)
+                    {
+                        ProcessStatus_T procStatus;
+                        LONG exitCode;
+                        if (   (   SUCCEEDED(pProcess->COMGETTER(Status(&procStatus)))
+                                && procStatus != ProcessStatus_TerminatedNormally)
+                            || (   SUCCEEDED(pProcess->COMGETTER(ExitCode(&exitCode)))
+                                && exitCode != 0)
+                           )
+                        {
+                            rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                                     Utf8StrFmt(GuestSession::tr("Updating Guest Additions failed with status %ld, exit code %d"),
+                                                                procStatus, exitCode)); /**@todo Add stringify methods! */
+                        }
+                        else /* Yay, success! */
+                            rc = setProgressSuccess();
+                    }
+                    else
+                    {
+                        if (RT_FAILURE(rc))
+                            hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                                     Utf8StrFmt(GuestSession::tr("Error while waiting for Guest Additions update: %Rrc"), rc));
+                        else
+                            hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                                     Utf8StrFmt(GuestSession::tr("Error installing Guest Additions update: %Rrc"),
+                                                                waitRes.mRC));
+                    }
+                }
+            }
+            RTIsoFsClose(&iso);
+        }
+    }
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
+int SessionTaskUpdateAdditions::RunAsync(const Utf8Str &strDesc, ComObjPtr<Progress> &pProgress)
+{
+    LogFlowThisFunc(("strDesc=%s, strSource=%s, uFlags=%x\n",
+                     strDesc.c_str(), mSource.c_str(), mFlags));
+
+    mDesc = strDesc;
+    mProgress = pProgress;
+
+    int rc = RTThreadCreate(NULL, SessionTaskUpdateAdditions::taskThread, this,
+                            0, RTTHREADTYPE_MAIN_HEAVY_WORKER, 0,
+                            "gctlUpGA");
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
+/* static */
+int SessionTaskUpdateAdditions::taskThread(RTTHREAD Thread, void *pvUser)
+{
+    std::auto_ptr<SessionTaskUpdateAdditions> task(static_cast<SessionTaskUpdateAdditions*>(pvUser));
     AssertReturn(task.get(), VERR_GENERAL_FAILURE);
 
@@ -1064 +1358 @@
         return rc;
 
-    try
-    {
-        AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-        /* Create the directory object. */
-        HRESULT hr = pDirectory.createObject();
-        if (FAILED(hr)) throw VERR_COM_UNEXPECTED;
-
-        /* Note: There will be a race between creating and getting/initing the directory
-                 object here. */
-        rc = pDirectory->init(this /* Parent */, strPath);
-        if (RT_FAILURE(rc)) throw rc;
-
-        /* Add the created directory to our vector. */
-        mData.mDirectories.push_back(pDirectory);
-
-        LogFlowFunc(("Added new directory \"%s\" (Session: %RU32)\n",
-                     strPath.c_str(), mData.mId));
-    }
-    catch (int rc2)
-    {
-        rc = rc2;
-    }
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    /* Create the directory object. */
+    HRESULT hr = pDirectory.createObject();
+    if (FAILED(hr))
+        return VERR_COM_UNEXPECTED;
+
+    /* Note: There will be a race between creating and getting/initing the directory
+             object here. */
+    rc = pDirectory->init(this /* Parent */, strPath);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    /* Add the created directory to our vector. */
+    mData.mDirectories.push_back(pDirectory);
+
+    LogFlowFunc(("Added new directory \"%s\" (Session: %RU32)\n",
+                 strPath.c_str(), mData.mId));
 
     LogFlowFuncLeaveRC(rc);
@@ -1097 +1386 @@
     LogFlowThisFunc(("strPath=%s, strPath=%s, uFlags=%x\n",
                      strPath.c_str(), strFilter.c_str(), uFlags));
-    int rc;
-
-    try
-    {
-        AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-        /* Create the directory object. */
-        HRESULT hr = pDirectory.createObject();
-        if (FAILED(hr)) throw VERR_COM_UNEXPECTED;
-
-        rc = pDirectory->init(this /* Parent */,
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    /* Create the directory object. */
+    HRESULT hr = pDirectory.createObject();
+    if (FAILED(hr))
+        return VERR_COM_UNEXPECTED;
+
+    int rc = pDirectory->init(this /* Parent */,
                               strPath, strFilter, uFlags);
-        if (RT_FAILURE(rc)) throw rc;
-
-        /* Add the created directory to our vector. */
-        mData.mDirectories.push_back(pDirectory);
-
-        LogFlowFunc(("Added new directory \"%s\" (Session: %RU32)\n",
-                     strPath.c_str(), mData.mId));
-    }
-    catch (int rc2)
-    {
-        rc = rc2;
-    }
+    if (RT_FAILURE(rc))
+        return rc;
+
+    /* Add the created directory to our vector. */
+    mData.mDirectories.push_back(pDirectory);
+
+    LogFlowFunc(("Added new directory \"%s\" (Session: %RU32)\n",
+                 strPath.c_str(), mData.mId));
 
     LogFlowFuncLeaveRC(rc);
@@ -1262 +1545 @@
     LogFlowThisFunc(("strPath=%s, strOpenMode=%s, strDisposition=%s, uCreationMode=%x, iOffset=%RI64\n",
                      strPath.c_str(), strOpenMode.c_str(), strDisposition.c_str(), uCreationMode, iOffset));
-    int rc;
-
-    try
-    {
-        /* Create the directory object. */
-        HRESULT hr = pFile.createObject();
-        if (FAILED(hr)) throw VERR_COM_UNEXPECTED;
-
-        /* Note: There will be a race between creating and getting/initing the directory
-                 object here. */
-        rc = pFile->init(this /* Parent */,
+
+    /* Create the directory object. */
+    HRESULT hr = pFile.createObject();
+    if (FAILED(hr))
+        return VERR_COM_UNEXPECTED;
+
+    /* Note: There will be a race between creating and getting/initing the directory
+             object here. */
+    int rc = pFile->init(this /* Parent */,
                          strPath, strOpenMode, strDisposition, uCreationMode, iOffset);
-        if (RT_FAILURE(rc)) throw rc;
-
-        /* Add the created directory to our vector. */
-        mData.mFiles.push_back(pFile);
-
-        LogFlowFunc(("Added new file \"%s\" (Session: %RU32\n",
-                     strPath.c_str(), mData.mId));
-    }
-    catch (int rc2)
-    {
-        rc = rc2;
-    }
+    if (RT_FAILURE(rc))
+        return rc;
+
+    /* Add the created directory to our vector. */
+    mData.mFiles.push_back(pFile);
+
+    LogFlowFunc(("Added new file \"%s\" (Session: %RU32\n",
+                 strPath.c_str(), mData.mId));
 
     LogFlowFuncLeaveRC(rc);
@@ -1491 +1768 @@
             break; /* Don't try too hard. */
     }
-    if (RT_FAILURE(rc)) return rc;
-
-    try
-    {
-        /* Create the process object. */
-        HRESULT hr = pProcess.createObject();
-        if (FAILED(hr)) throw VERR_COM_UNEXPECTED;
-
-        rc = pProcess->init(mData.mParent->getConsole() /* Console */, this /* Session */,
-                            uNewProcessID, procInfo);
-        if (RT_FAILURE(rc)) throw rc;
-
-        /* Add the created process to our map. */
-        mData.mProcesses[uNewProcessID] = pProcess;
-
-        LogFlowFunc(("Added new process (Session: %RU32) with process ID=%RU32 (now total %ld processes)\n",
-                     mData.mId, uNewProcessID, mData.mProcesses.size()));
-    }
-    catch (int rc2)
-    {
-        rc = rc2;
-    }
+
+    if (RT_FAILURE(rc))
+        return rc;
+
+    /* Create the process object. */
+    HRESULT hr = pProcess.createObject();
+    if (FAILED(hr))
+        return VERR_COM_UNEXPECTED;
+
+    rc = pProcess->init(mData.mParent->getConsole() /* Console */, this /* Session */,
+                        uNewProcessID, procInfo);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    /* Add the created process to our map. */
+    mData.mProcesses[uNewProcessID] = pProcess;
+
+    LogFlowFunc(("Added new process (Session: %RU32) with process ID=%RU32 (now total %ld processes)\n",
+                 mData.mId, uNewProcessID, mData.mProcesses.size()));
 
     return rc;
@@ -1560 +1834 @@
     AssertPtrReturn(pTask, VERR_INVALID_POINTER);
 
-    int rc;
-
-    try
-    {
-        /* Create the progress object. */
-        HRESULT hr = pProgress.createObject();
-        if (FAILED(hr)) throw VERR_COM_UNEXPECTED;
-
-        hr = pProgress->init(static_cast<IGuestSession*>(this),
-                             Bstr(strTaskDesc).raw(),
-                             TRUE /* aCancelable */);
-        if (FAILED(hr)) throw VERR_COM_UNEXPECTED;
-
-        /* Initialize our worker task. */
-        std::auto_ptr<GuestSessionTask> task(pTask);
-
-        rc = task->RunAsync(strTaskDesc, pProgress);
-        if (FAILED(rc)) throw rc;
-
-        /* Don't destruct on success. */
-        task.release();
-    }
-    catch (int rc2)
-    {
-        rc = rc2;
-    }
+    /* Create the progress object. */
+    HRESULT hr = pProgress.createObject();
+    if (FAILED(hr))
+        return VERR_COM_UNEXPECTED;
+
+    hr = pProgress->init(static_cast<IGuestSession*>(this),
+                         Bstr(strTaskDesc).raw(),
+                         TRUE /* aCancelable */);
+    if (FAILED(hr))
+        return VERR_COM_UNEXPECTED;
+
+    /* Initialize our worker task. */
+    std::auto_ptr<GuestSessionTask> task(pTask);
+
+    int rc = task->RunAsync(strTaskDesc, pProgress);
+    if (RT_FAILURE(rc))
+        return rc;
+
+    /* Don't destruct on success. */
+    task.release();
 
     LogFlowFuncLeaveRC(rc);