Changeset 42611 in vbox for trunk/src/VBox

Timestamp:

Aug 6, 2012 8:42:23 AM (12 years ago)

Author:

vboxsync

Message:

Guest Control 2.0: Update.

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (2 diffs)
• include/GuestCtrlImplPrivate.h (modified) (2 diffs)
• include/GuestFileImpl.h (modified) (5 diffs)
• include/GuestProcessImpl.h (modified) (2 diffs)
• include/GuestSessionImpl.h (modified) (2 diffs)
• src-client/GuestCtrlImpl.cpp (modified) (1 diff)
• src-client/GuestCtrlPrivate.cpp (modified) (3 diffs)
• src-client/GuestFileImpl.cpp (modified) (10 diffs)
• src-client/GuestProcessImpl.cpp (modified) (8 diffs)
• src-client/GuestSessionImpl.cpp (modified) (26 diffs)

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

@@ -10265 +10265 @@
   <interface
     name="IFile" extends="$unknown"
-    uuid="2615152d-35c0-4363-8325-ab7e1f2b8b34"
+    uuid="b3484293-b98b-4952-ae23-f18eca6a5ff9"
     wsmap="managed"
     >
@@ -10271 +10271 @@
       TODO
     </desc>
-    
+    <attribute name="creationMode" type="unsigned long" readonly="yes">
+      <desc>
+        TODO
+        <note>
+          TODO
+        </note>
+      </desc>
+    </attribute>
+    <attribute name="disposition" type="unsigned long" readonly="yes">
+      <desc>
+        TODO
+        <note>
+          TODO
+        </note>
+      </desc>
+    </attribute>
     <attribute name="fileName" type="wstring" readonly="yes">
       <desc>

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

@@ -305 +305 @@
  * starting parameters around.
  */
-struct GuestProcessInfo
-{
+struct GuestProcessStartupInfo
+{
+    GuestProcessStartupInfo(void)
+        : mFlags(ProcessCreateFlag_None),
+          mPriority(ProcessPriority_Default),
+          mTimeoutMS(30 * 1000 /* 30s timeout by default */) { }
+
     /** The process' friendly name. */
     Utf8Str                     mName;
@@ -317 +322 @@
     ProcessPriority_T           mPriority;
     ProcessAffinity             mAffinity;
-
 };
 

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

@@ -24 +24 @@
 #include "GuestFsObjInfoImpl.h"
 
+class GuestSession;
+class GuestProcess;
+
 /**
  * TODO
@@ -43 +46 @@
     DECLARE_EMPTY_CTOR_DTOR(GuestFile)
 
-    HRESULT init(void);
+    int     init(GuestSession *pSession, const Utf8Str &strPath, const Utf8Str &strOpenMode, const Utf8Str &strDisposition, uint32_t uCreationMode, int64_t iOffset);
     void    uninit(void);
     HRESULT FinalConstruct(void);
@@ -49 +52 @@
     /** @}  */
 
-    /** @name IDirectory interface.
+    /** @name IFile interface.
      * @{ */
+    STDMETHOD(COMGETTER(CreationMode))(ULONG *aCreationMode);
+    STDMETHOD(COMGETTER(Disposition))(ULONG *aDisposition);
     STDMETHOD(COMGETTER(FileName))(BSTR *aFileName);
     STDMETHOD(COMGETTER(InitialSize))(LONG64 *aInitialSize);
@@ -57 +62 @@
 
     STDMETHOD(Close)(void);
-    STDMETHOD(QueryInfo)(IGuestFsObjInfo **aInfo);
+    STDMETHOD(QueryInfo)(IFsObjInfo **aInfo);
     STDMETHOD(Read)(ULONG aToRead, ULONG *aRead, ComSafeArrayOut(BYTE, aData));
     STDMETHOD(ReadAt)(LONG64 aOffset, ULONG aToRead, ULONG *aRead, ComSafeArrayOut(BYTE, aData));
@@ -66 +71 @@
     /** @}  */
 
+public:
+    /** @name Public internal methods.
+     * @{ */
+    static uint32_t getDispositionFromString(const Utf8Str &strDisposition);
+    static uint32_t getOpenModeFromString(const Utf8Str &strOpenMode);
+    /** @}  */
+
 private:
 
     struct Data
     {
-        Utf8Str              mFileName;
-        LONG64               mInitialSize;
-        ULONG                mOpenMode;
-        LONG64               mOffset;
+        /** The associate session this file belongs to. */
+        ComObjPtr<GuestSession> mSession;
+        /** The process object this file is bound to. */
+        ComObjPtr<GuestProcess> mProcess;
+        uint32_t                mCreationMode;
+        uint32_t                mDisposition;
+        Utf8Str                 mFileName;
+        int64_t                 mInitialSize;
+        uint32_t                mOpenMode;
+        int64_t                 mOffset;
     } mData;
 };

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

@@ -45 +45 @@
     DECLARE_EMPTY_CTOR_DTOR(GuestProcess)
 
-    int     init(Console *aConsole, GuestSession *aSession, ULONG aProcessID, const GuestProcessInfo &aProcInfo);
+    int     init(Console *aConsole, GuestSession *aSession, ULONG aProcessID, const GuestProcessStartupInfo &aProcInfo);
     void    uninit(void);
     HRESULT FinalConstruct(void);
@@ -117 +117 @@
         GuestCtrlCallbacks       mCallbacks;
         /** The process start information. */
-        GuestProcessInfo         mProcess;
+        GuestProcessStartupInfo  mProcess;
         /** Exit code if process has been terminated. */
         LONG                     mExitCode;

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

@@ -205 +205 @@
     int                     dispatchToProcess(uint32_t uContextID, uint32_t uFunction, void *pvData, size_t cbData);
     int                     fileClose(ComObjPtr<GuestFile> pFile);
+    int                     fileOpenInternal(const Utf8Str &strPath, const Utf8Str &strOpenMode, const Utf8Str &strDisposition,
+                                             uint32_t uCreationMode, int64_t iOffset, ComObjPtr<GuestFile> &pFile);
     int                     fileQueryInfoInternal(const Utf8Str &strPath, GuestFsObjData &objData);
     int                     fileQuerySizeInternal(const Utf8Str &strPath, int64_t *pllSize);
@@ -212 +214 @@
     uint32_t                getProtocolVersion(void) { return mData.mProtocolVersion; }
     int                     processClose(ComObjPtr<GuestProcess> pProcess);
-    int                     processCreateExInteral(GuestProcessInfo &procInfo, ComObjPtr<GuestProcess> &pProgress);
+    int                     processCreateExInteral(GuestProcessStartupInfo &procInfo, ComObjPtr<GuestProcess> &pProgress);
     inline bool             processExists(uint32_t uProcessID, ComObjPtr<GuestProcess> *pProcess);
     inline int              processGetByPID(ULONG uPID, ComObjPtr<GuestProcess> *pProcess);

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

@@ -707 +707 @@
                  VBOX_GUESTCTRL_CONTEXTID_GET_COUNT(pHeader->u32ContextID)));
 #endif
-    int rc = pGuest->dispatchToSession(pHeader->u32ContextID, u32Function, pvParms, cbParms);
+
+    bool fDispatch = true;
+#ifdef DEBUG
+    /*
+     * Pre-check: If we got a status message with an error and VERR_TOO_MUCH_DATA
+     *            it means that that guest could not handle the entire message
+     *            because of its exceeding size. This should not happen on daily
+     *            use but testcases might try this. It then makes no sense to dispatch
+     *            this further because we don't have a valid context ID.
+     */
+    if (u32Function == GUEST_EXEC_SEND_STATUS)
+    {
+        PCALLBACKDATAEXECSTATUS pCallbackData = reinterpret_cast<PCALLBACKDATAEXECSTATUS>(pvParms);
+        AssertPtr(pCallbackData);
+        AssertReturn(sizeof(CALLBACKDATAEXECSTATUS) == cbParms, VERR_INVALID_PARAMETER);
+        AssertReturn(CALLBACKDATAMAGIC_EXEC_STATUS == pCallbackData->hdr.u32Magic, VERR_INVALID_PARAMETER);
+
+        if (   pCallbackData->u32Status == PROC_STS_ERROR
+            && pCallbackData->u32Flags  == VERR_TOO_MUCH_DATA)
+        {
+            LogFlowFunc(("Requested command with too much data, skipping dispatching ...\n"));
+
+            Assert(pCallbackData->u32PID == 0);
+            fDispatch = false;
+        }
+    }
+#endif
+    int rc = VINF_SUCCESS;
+    if (fDispatch)
+        rc = pGuest->dispatchToSession(pHeader->u32ContextID, u32Function, pvParms, cbParms);
 
 #ifdef VBOX_WITH_GUEST_CONTROL_LEGACY

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

@@ -47 +47 @@
 int GuestCtrlEvent::Cancel(void)
 {
-    LogFlowThisFuncEnter();
-
     int rc = VINF_SUCCESS;
     if (!ASMAtomicReadBool(&fCompleted))
@@ -56 +54 @@
             ASMAtomicXchgBool(&fCanceled, true);
 
-            LogFlowThisFunc(("Cancelling ...\n"));
+            LogFlowThisFunc(("Cancelling event ...\n"));
             rc = hEventSem != NIL_RTSEMEVENT
                ? RTSemEventSignal(hEventSem) : VINF_SUCCESS;
@@ -62 +60 @@
     }
 
-    LogFlowFuncLeaveRC(rc);
     return rc;
 }

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

@@ -22 +22 @@
 *******************************************************************************/
 #include "GuestFileImpl.h"
+#include "GuestSessionImpl.h"
 #include "GuestCtrlImplPrivate.h"
 
@@ -52 +53 @@
 /////////////////////////////////////////////////////////////////////////////
 
-HRESULT GuestFile::init(void)
+int GuestFile::init(GuestSession *pSession, const Utf8Str &strPath,
+                    const Utf8Str &strOpenMode, const Utf8Str &strDisposition, uint32_t uCreationMode,
+                    int64_t iOffset)
 {
     /* Enclose the state transition NotReady->InInit->Ready. */
@@ -58 +61 @@
     AssertReturn(autoInitSpan.isOk(), E_FAIL);
 
+    mData.mSession = pSession;
+    mData.mCreationMode = uCreationMode;
+    mData.mDisposition = getDispositionFromString(strDisposition);
+    mData.mFileName = strPath;
+    mData.mInitialSize = 0;
+    mData.mOpenMode = getOpenModeFromString(strOpenMode);
+    mData.mOffset = iOffset;
+
+    /** @todo Validate parameters! */
+
     /* Confirm a successful initialization when it's the case. */
     autoInitSpan.setSucceeded();
 
-    return S_OK;
+    return VINF_SUCCESS;
 }
 
@@ -76 +89 @@
     if (autoUninitSpan.uninitDone())
         return;
+
+    mData.mSession->fileClose(this);
 }
 
@@ -81 +96 @@
 /////////////////////////////////////////////////////////////////////////////
 
+STDMETHODIMP GuestFile::COMGETTER(CreationMode)(ULONG *aCreationMode)
+{
+#ifndef VBOX_WITH_GUEST_CONTROL
+    ReturnComNotImplemented();
+#else
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    CheckComArgOutPointerValid(aCreationMode);
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    *aCreationMode = mData.mCreationMode;
+
+    return S_OK;
+#endif /* VBOX_WITH_GUEST_CONTROL */
+}
+
+STDMETHODIMP GuestFile::COMGETTER(Disposition)(ULONG *aDisposition)
+{
+#ifndef VBOX_WITH_GUEST_CONTROL
+    ReturnComNotImplemented();
+#else
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    CheckComArgOutPointerValid(aDisposition);
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    *aDisposition = mData.mDisposition;
+
+    return S_OK;
+#endif /* VBOX_WITH_GUEST_CONTROL */
+}
+
 STDMETHODIMP GuestFile::COMGETTER(FileName)(BSTR *aFileName)
 {
@@ -89 +140 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    ReturnComNotImplemented();
+    CheckComArgOutPointerValid(aFileName);
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    mData.mFileName.cloneTo(aFileName);
+
+    return S_OK;
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }
@@ -101 +158 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    ReturnComNotImplemented();
+    CheckComArgOutPointerValid(aInitialSize);
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    *aInitialSize = mData.mInitialSize;
+
+    return S_OK;
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }
@@ -113 +176 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    ReturnComNotImplemented();
+    CheckComArgOutPointerValid(aOffset);
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    *aOffset = mData.mOffset;
+
+    return S_OK;
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }
@@ -125 +194 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    ReturnComNotImplemented();
-#endif /* VBOX_WITH_GUEST_CONTROL */
+    CheckComArgOutPointerValid(aOpenMode);
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    *aOpenMode = mData.mOpenMode;
+
+    return S_OK;
+#endif /* VBOX_WITH_GUEST_CONTROL */
+}
+
+// private methods
+/////////////////////////////////////////////////////////////////////////////
+
+/* static */
+uint32_t GuestFile::getDispositionFromString(const Utf8Str &strDisposition)
+{
+    return 0; /** @todo Implement me! */
+}
+
+/* static */
+uint32_t GuestFile::getOpenModeFromString(const Utf8Str &strOpenMode)
+{
+    return 0; /** @todo Implement me! */
 }
 
@@ -144 +234 @@
 }
 
-STDMETHODIMP GuestFile::QueryInfo(IGuestFsObjInfo **aInfo)
+STDMETHODIMP GuestFile::QueryInfo(IFsObjInfo **aInfo)
 {
 #ifndef VBOX_WITH_GUEST_CONTROL

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

@@ -104 +104 @@
 /////////////////////////////////////////////////////////////////////////////
 
-int GuestProcess::init(Console *aConsole, GuestSession *aSession, ULONG aProcessID, const GuestProcessInfo &aProcInfo)
+int GuestProcess::init(Console *aConsole, GuestSession *aSession, ULONG aProcessID, const GuestProcessStartupInfo &aProcInfo)
 {
     LogFlowThisFunc(("aConsole=%p, aSession=%p, aProcessID=%RU32\n",
@@ -178 +178 @@
     collection.detachTo(ComSafeArrayOutArg(aArguments));
 
-    LogFlowFuncLeaveRC(S_OK);
     return S_OK;
 #endif /* VBOX_WITH_GUEST_CONTROL */
@@ -205 +204 @@
     arguments.detachTo(ComSafeArrayOutArg(aEnvironment));
 
-    LogFlowFuncLeaveRC(S_OK);
     return S_OK;
 #endif /* VBOX_WITH_GUEST_CONTROL */
@@ -226 +224 @@
     mData.mProcess.mCommand.cloneTo(aExecutablePath);
 
-    LogFlowFuncLeaveRC(S_OK);
     return S_OK;
 #endif /* VBOX_WITH_GUEST_CONTROL */
@@ -247 +244 @@
     *aExitCode = mData.mExitCode;
 
-    LogFlowFuncLeaveRC(S_OK);
     return S_OK;
 #endif /* VBOX_WITH_GUEST_CONTROL */
@@ -268 +264 @@
     mData.mProcess.mName.cloneTo(aName);
 
-    LogFlowFuncLeaveRC(S_OK);
     return S_OK;
 #endif /* VBOX_WITH_GUEST_CONTROL */
@@ -289 +284 @@
     *aPID = mData.mPID;
 
-    LogFlowFuncLeaveRC(S_OK);
     return S_OK;
 #endif /* VBOX_WITH_GUEST_CONTROL */
@@ -308 +302 @@
     *aStatus = mData.mStatus;
 
-    LogFlowFuncLeaveRC(S_OK);
     return S_OK;
 #endif /* VBOX_WITH_GUEST_CONTROL */

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

@@ -143 +143 @@
     int rc;
 
-    /** @todo Make use of exception (+ finally block) here! */
+    /** @todo Make use of exceptions (+ finally block) here! */
 
     try
@@ -152 +152 @@
             rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
                                      Utf8StrFmt(GuestSession::tr("Source file \"%s\" does not exist or is not a file"),
-                                     mSource.c_str()));
+                                                mSource.c_str()));
         }
         else
@@ -163 +163 @@
                 rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
                                          Utf8StrFmt(GuestSession::tr("Could not open source file \"%s\" for reading (%Rrc)"),
-                                         mSource.c_str(), rc));
+                                                    mSource.c_str(), rc));
             }
             else
@@ -172 +172 @@
                 {
                     setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                        Utf8StrFmt(GuestSession::tr("Could not query file size of \"%s\" (%Rrc)"),
-                                        mSource.c_str(), rc));
+                                        Utf8StrFmt(GuestSession::tr("Could not query file size of \"%s\": %Rrc"),
+                                                   mSource.c_str(), rc));
                 }
                 else
                 {
-                    GuestProcessInfo procInfo;
+                    GuestProcessStartupInfo procInfo;
                     procInfo.mName    = Utf8StrFmt(GuestSession::tr("Copying file \"%s\" to the guest to \"%s\" (%RU64 bytes)"),
-                                                                    mSource.c_str(), mDest.c_str(), cbFileSize);
+                                                   mSource.c_str(), mDest.c_str(), cbFileSize);
                     procInfo.mCommand = Utf8Str(VBOXSERVICE_TOOL_CAT);
                     procInfo.mFlags   = ProcessCreateFlag_None;
@@ -190 +190 @@
                     int 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;
@@ -227 +234 @@
                                         setProgressErrorMsg(VBOX_E_IPRT_ERROR,
                                                             Utf8StrFmt(GuestSession::tr("Could not read from file \"%s\" (%Rrc)"),
-                                                            mSource.c_str(), rc));
+                                                                       mSource.c_str(), rc));
                                         break;
                                     }
@@ -235 +242 @@
                                     setProgressErrorMsg(VBOX_E_IPRT_ERROR,
                                                         Utf8StrFmt(GuestSession::tr("Seeking file \"%s\" offset %RU64 failed: %Rrc"),
-                                                        mSource.c_str(), cbWrittenTotal, rc));
+                                                                   mSource.c_str(), cbWrittenTotal, rc));
                                     break;
                                 }
@@ -262 +269 @@
                                 setProgressErrorMsg(VBOX_E_IPRT_ERROR,
                                                     Utf8StrFmt(GuestSession::tr("Writing to file \"%s\" (offset %RU64) failed: %Rrc"),
-                                                    mSource.c_str(), cbWrittenTotal, rc));
+                                                               mSource.c_str(), cbWrittenTotal, rc));
                                 break;
                             }
 
-                            /* Safety first. */
-                            Assert(cbRead <= cbToRead);
-                            Assert(cbToRead >= cbRead);
-
                             /* Only subtract bytes reported written by the guest. */
+                            Assert(cbToRead >= cbWritten);
                             cbToRead -= cbWritten;
 
@@ -282 +286 @@
 
                             /* Update the progress. */
+                            Assert(!mProgress.isNull());
                             HRESULT hr = mProgress->SetCurrentOperationProgress((ULONG)(cbWrittenTotal * 100 / cbFileSize));
                             if (FAILED(hr))
                             {
                                 rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
-                                                         Utf8StrFmt(GuestSession::tr("Error updating the progress of copying files \"%s\" to \"%s\""),
-                                                         mSource.c_str(), mDest.c_str()));
+                                                         Utf8StrFmt(GuestSession::tr("Error updating the progress of copying file \"%s\" to \"%s\""),
+                                                                    mSource.c_str(), mDest.c_str()));
                                 break;
                             }
@@ -310 +315 @@
                                 rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
                                                          Utf8StrFmt(GuestSession::tr("Access denied when copying file \"%s\" to \"%s\""),
-                                                         mSource.c_str(), mDest.c_str()));
+                                                                    mSource.c_str(), mDest.c_str()));
                             }
                             else if (cbWrittenTotal < cbFileSize)
@@ -317 +322 @@
                                 rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
                                                          Utf8StrFmt(GuestSession::tr("Copying file \"%s\" failed (%RU64/%RU64 bytes transfered)"),
-                                                         mSource.c_str(), cbWrittenTotal, cbFileSize));
+                                                                    mSource.c_str(), cbWrittenTotal, cbFileSize));
                             }
-                            else /* Yay, all went fine! */
-                                rc = setProgressSuccess();
+                            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();
+                            }
                         }
+
+                        pSession->processClose(pProcess);
                     } /* processCreateExInteral */
                 } /* RTFileGetSize */
@@ -379 +401 @@
 int SessionTaskCopyFrom::Run(void)
 {
-    return 0;
+    LogFlowThisFuncEnter();
+
+    ComObjPtr<GuestSession> pSession = mSession;
+    Assert(!pSession.isNull());
+
+    AutoCaller autoCaller(pSession);
+    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);
+        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("Error opening destination file \"%s\": %Rrc"),
+                                               mDest.c_str(), rc));
+            }
+            else
+            {
+                GuestProcessStartupInfo procInfo;
+                procInfo.mName    = Utf8StrFmt(GuestSession::tr("Copying file \"%s\" to the host to \"%s\" (%RI64 bytes)"),
+                                                                mSource.c_str(), mDest.c_str(), objData.mObjectSize);
+                procInfo.mCommand   = Utf8Str(VBOXSERVICE_TOOL_CAT);
+                procInfo.mFlags     = ProcessCreateFlag_WaitForStdOut;
+
+                /* Set arguments.*/
+                procInfo.mArguments.push_back(mSource); /* Which file to output? */
+
+                /* Startup process. */
+                ComObjPtr<GuestProcess> pProcess;
+                int 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 = objData.mObjectSize;
+
+                    for (;;)
+                    {
+                        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);
+                        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("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;
+
+                            Assert(!mProgress.isNull());
+                            HRESULT hr = mProgress->SetCurrentOperationProgress(cbWrittenTotal / ((uint64_t)objData.mObjectSize / 100.0));
+                            if (FAILED(hr))
+                            {
+                                rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
+                                                         Utf8StrFmt(GuestSession::tr("Error updating the progress of copying file \"%s\" to \"%s\""),
+                                                         mSource.c_str(), mDest.c_str()));
+                                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 = 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();
+                        }
+                    }
+
+                    pSession->processClose(pProcess);
+                }
+
+                RTFileClose(fileDest);
+            }
+        }
+    }
+    catch (int rc2)
+    {
+        rc = rc2;
+    }
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
 }
 
@@ -764 +978 @@
                      strPath.c_str(), uMode, uFlags));
 
-    GuestProcessInfo procInfo;
-    procInfo.mName    = Utf8StrFmt(tr("Creating directory \"%s\"", strPath.c_str()));
-    procInfo.mCommand = Utf8Str(VBOXSERVICE_TOOL_MKDIR);
+    GuestProcessStartupInfo procInfo;
+    procInfo.mName      = Utf8StrFmt(tr("Creating directory \"%s\"", strPath.c_str()));
+    procInfo.mCommand   = Utf8Str(VBOXSERVICE_TOOL_MKDIR);
 
     int rc = VINF_SUCCESS;
@@ -789 +1003 @@
     ComObjPtr<GuestProcess> pProcess;
     rc = processCreateExInteral(procInfo, pProcess);
+    if (RT_SUCCESS(rc))
+        rc = pProcess->startProcess();
     if (RT_SUCCESS(rc))
     {
@@ -815 +1031 @@
     try
     {
+        AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
         /* Create the directory object. */
         HRESULT hr = pDirectory.createObject();
@@ -827 +1045 @@
         mData.mDirectories.push_back(pDirectory);
 
-        LogFlowFunc(("Added new directory (Session: %RU32) with process ID=%RU32\n",
-                     mData.mId, mData.mNextProcessID));
+        LogFlowFunc(("Added new directory \"%s\" (Session: %RU32)\n",
+                     strPath.c_str(), mData.mId));
     }
     catch (int rc2)
@@ -885 +1103 @@
 }
 
+int GuestSession::fileOpenInternal(const Utf8Str &strPath, const Utf8Str &strOpenMode, const Utf8Str &strDisposition,
+                                   uint32_t uCreationMode, int64_t iOffset, ComObjPtr<GuestFile> &pFile)
+{
+    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 */,
+                         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;
+    }
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
 /* Note: Will work on directories and others, too. */
 int GuestSession::fileQueryInfoInternal(const Utf8Str &strPath, GuestFsObjData &objData)
@@ -890 +1142 @@
     LogFlowThisFunc(("strPath=%s\n", strPath.c_str()));
 
-    GuestProcessInfo procInfo;
-    procInfo.mName    = Utf8StrFmt(tr("Querying info for \"%s\"", strPath.c_str()));
+    GuestProcessStartupInfo procInfo;
+    procInfo.mName    = Utf8StrFmt(tr("Querying info for \"%s\""), strPath.c_str());
     procInfo.mCommand = Utf8Str(VBOXSERVICE_TOOL_STAT);
     procInfo.mFlags   = ProcessCreateFlag_WaitForStdOut;
@@ -904 +1156 @@
     int rc = processCreateExInteral(procInfo, pProcess);
     if (RT_SUCCESS(rc))
+        rc = pProcess->startProcess();
+    if (RT_SUCCESS(rc))
     {
         GuestProcessWaitResult waitRes;
         BYTE byBuf[_64K];
-        size_t cbRead;
+        size_t cbRead = 0;
 
         for (;;)
@@ -914 +1168 @@
                                    30 * 1000 /* Timeout */, waitRes);
             if (   RT_FAILURE(rc)
-                || waitRes.mResult != ProcessWaitResult_StdOut)
+                || waitRes.mResult == ProcessWaitResult_Terminate
+                || waitRes.mResult == ProcessWaitResult_Error
+                || waitRes.mResult == ProcessWaitResult_Timeout)
             {
                 break;
@@ -925 +1181 @@
                 break;
 
-            rc = streamOut.AddData(byBuf, cbRead);
-            if (RT_FAILURE(rc))
-                break;
-        }
-
-        LogFlowThisFunc(("rc=%Rrc, cbRead=%RU32, cbStreamOut=%RU32\n",
+            if (cbRead)
+            {
+                rc = streamOut.AddData(byBuf, cbRead);
+                if (RT_FAILURE(rc))
+                    break;
+            }
+        }
+
+        LogFlowThisFunc(("rc=%Rrc, cbRead=%RU64, cbStreamOut=%RU32\n",
                          rc, cbRead, streamOut.GetSize()));
     }
@@ -999 +1258 @@
 }
 
-int GuestSession::processCreateExInteral(GuestProcessInfo &procInfo, ComObjPtr<GuestProcess> &pProcess)
+/**
+ * Creates but does *not* start the process yet. See GuestProcess::startProcess() or
+ * GuestProcess::startProcessAsync() for that.
+ *
+ * @return  IPRT status code.
+ * @param   procInfo
+ * @param   pProcess
+ */
+int GuestSession::processCreateExInteral(GuestProcessStartupInfo &procInfo, ComObjPtr<GuestProcess> &pProcess)
 {
     LogFlowFunc(("mCmd=%s, mFlags=%x, mTimeoutMS=%RU32\n",
                  procInfo.mCommand.c_str(), procInfo.mFlags, procInfo.mTimeoutMS));
+#ifdef DEBUG
+    if (procInfo.mArguments.size())
+    {
+        LogFlowFunc(("Arguments:"));
+        ProcessArguments::const_iterator it = procInfo.mArguments.begin();
+        while (it != procInfo.mArguments.end())
+        {
+            LogFlow((" %s", (*it).c_str()));
+            it++;
+        }
+        LogFlow(("\n"));
+    }
+#endif
 
     /* Validate flags. */
@@ -1323 +1603 @@
             fFlags |= flags[i];
 
-        if (!(fFlags & DirectoryCreateFlag_Parents))
-            return setError(E_INVALIDARG, tr("Unknown flags (%#x)"), fFlags);
+        if (fFlags)
+        {
+            if (!(fFlags & DirectoryCreateFlag_Parents))
+                return setError(E_INVALIDARG, tr("Unknown flags (%#x)"), fFlags);
+        }
     }
 
@@ -1330 +1613 @@
 
     ComObjPtr <GuestDirectory> pDirectory;
-    int rc = directoryCreateInternal(Utf8Str(aPath), (uint32_t)aMode, (uint32_t)aFlags, pDirectory);
+    int rc = directoryCreateInternal(Utf8Str(aPath), (uint32_t)aMode, fFlags, pDirectory);
     if (RT_SUCCESS(rc))
     {
@@ -1652 +1935 @@
     LogFlowThisFuncEnter();
 
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    ReturnComNotImplemented();
+    if (RT_UNLIKELY((aPath) == NULL || *(aPath) == '\0'))
+        return setError(E_INVALIDARG, tr("No file to open specified"));
+    if (RT_UNLIKELY((aOpenMode) == NULL || *(aOpenMode) == '\0'))
+        return setError(E_INVALIDARG, tr("No open mode specified"));
+    if (RT_UNLIKELY((aDisposition) == NULL || *(aDisposition) == '\0'))
+        return setError(E_INVALIDARG, tr("No disposition mode specified"));
+
+    CheckComArgOutPointerValid(aFile);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    /** @todo Validate open mode. */
+    /** @todo Validate disposition mode. */
+
+    /** @todo Validate creation mode. */
+    uint32_t uCreationMode = 0;
+
+    HRESULT hr = S_OK;
+
+    ComObjPtr <GuestFile> pFile;
+    int rc = fileOpenInternal(Utf8Str(aPath), Utf8Str(aOpenMode), Utf8Str(aDisposition),
+                              aCreationMode, aOffset, pFile);
+    if (RT_SUCCESS(rc))
+    {
+        /* Return directory object to the caller. */
+        hr = pFile.queryInterfaceTo(aFile);
+    }
+    else
+    {
+        switch (rc)
+        {
+            /** @todo Add more error info! */
+
+            default:
+               hr = setError(VBOX_E_IPRT_ERROR, tr("Directory creation failed: %Rrc"), rc);
+               break;
+        }
+    }
+
+    return hr;
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }
@@ -1786 +2106 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    GuestProcessInfo procInfo;
-
+    GuestProcessStartupInfo procInfo;
     procInfo.mCommand = Utf8Str(aCommand);
-    procInfo.mFlags = ProcessCreateFlag_None;
 
     if (aArguments)