Changeset 42673 in vbox for trunk

Timestamp:

Aug 8, 2012 8:07:09 AM (12 years ago)

Author:

vboxsync

Message:

Guest Control 2.0: Update.

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (9 diffs)
• include/GuestCtrlImplPrivate.h (modified) (3 diffs)
• include/GuestDirectoryImpl.h (modified) (4 diffs)
• include/GuestFsObjInfoImpl.h (modified) (3 diffs)
• include/GuestProcessImpl.h (modified) (2 diffs)
• include/GuestSessionImpl.h (modified) (2 diffs)
• src-client/GuestCtrlImpl.cpp (modified) (2 diffs)
• src-client/GuestCtrlImplDir.cpp (modified) (1 diff)
• src-client/GuestCtrlPrivate.cpp (modified) (4 diffs)
• src-client/GuestDirectoryImpl.cpp (modified) (5 diffs)
• src-client/GuestFsObjInfoImpl.cpp (modified) (16 diffs)
• src-client/GuestProcessImpl.cpp (modified) (9 diffs)
• src-client/GuestSessionImpl.cpp (modified) (5 diffs)

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

@@ -9329 +9329 @@
   <enum
     name="DirectoryOpenFlag"
-    uuid="fc8f6203-0072-4f34-bd08-0b35e50bf071"
+    uuid="5138837a-8fd2-4194-a1b0-08f7bc3949d0"
     >
     <desc>
@@ -9336 +9336 @@
     <const name="None"                    value="0">
       <desc>No flag set.</desc>
+    </const>
+    <const name="NoSymlinks"              value="1">
+      <desc>Don't allow symbolic links as part of the path.</desc>
     </const>
   </enum>
@@ -9381 +9384 @@
   <interface
     name="IGuestSession" extends="$unknown"
-    uuid="9233c0b5-8f0d-48b2-9b90-b730880f1e35"
+    uuid="45aca317-55d7-4b6c-bbec-d053289118b9"
     wsmap="managed"
     >
@@ -9582 +9585 @@
         <desc>TODO</desc>
       </param>
-      <param name="flags" type="wstring" dir="in">
+      <param name="flags" type="DirectoryOpenFlag" dir="in" safearray="yes">
         <desc>TODO</desc>
       </param>
@@ -10233 +10236 @@
   <interface
     name="IDirectory" extends="$unknown"
-    uuid="e55ab5e5-4feb-452b-86ed-59cff4c581a3"
+    uuid="1b70dd03-26d7-483a-8877-89bbb0f87b70"
     wsmap="managed"
     >
@@ -10249 +10252 @@
     </attribute>
     
-    <method name="read">
+    <attribute name="filter" type="wstring" readonly="yes">
+      <desc>
+        The open filter.
+        <note>
+          TODO
+        </note>
+      </desc>
+    </attribute>
+    
+    <method name="close">
       <desc>
         TODO
@@ -10255 +10267 @@
         <result name="VBOX_E_NOT_SUPPORTED">
           TODO
+        </result>
+      </desc>
+    </method>
+    
+    <method name="read">
+      <desc>
+        TODO
+
+        <result name="VBOX_E_OBJECT_NOT_FOUND">
+          End of directory listing reached.
         </result>
       </desc>
@@ -10472 +10494 @@
   <interface
     name="IFsObjInfo" extends="$unknown"
-    uuid="4925335b-9aa6-4870-bda3-8edb09fb602c"
+    uuid="4047ba30-7006-4966-ae86-94164e5e20eb"
     wsmap="managed"
     >
@@ -10519 +10541 @@
       </desc>
     </attribute>
-    <attribute name="fileAtttributes" type="wstring" readonly="yes">
+    <attribute name="fileAttributes" type="wstring" readonly="yes">
       <desc>
         TODO

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

@@ -275 +275 @@
 {
     /** Helper function to extract the data from
-     *  a guest stream block. */
-    int From(const GuestProcessStreamBlock &strmBlk);
+     *  a certin VBoxService tool's guest stream block. */
+    int FromLs(const GuestProcessStreamBlock &strmBlk);
+    int FromStat(const GuestProcessStreamBlock &strmBlk);
 
     int64_t              mAccessTime;
@@ -365 +366 @@
 public:
 
-    void Clear();
+    void Clear(void);
 
 #ifdef DEBUG
-    void Dump();
+    void DumpToLog(void) const;
 #endif
 
@@ -382 +383 @@
 
     uint32_t GetUInt32(const char *pszKey) const;
+
+    bool IsEmpty(void) { return m_mapPairs.empty(); }
 
     int SetValue(const char *pszKey, const char *pszValue);

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

@@ -21 +21 @@
 
 #include "VirtualBoxBase.h"
+#include "GuestCtrlImplPrivate.h"
 
+class GuestProcess;
 class GuestSession;
 
@@ -43 +45 @@
     DECLARE_EMPTY_CTOR_DTOR(GuestDirectory)
 
-    int     init(GuestSession *aSession, const Utf8Str &strPath);
+    int     init(GuestSession *aSession, const Utf8Str &strPath, const Utf8Str &strFilter = "", uint32_t uFlags = 0);
     void    uninit(void);
     HRESULT FinalConstruct(void);
@@ -52 +54 @@
      * @{ */
     STDMETHOD(COMGETTER(DirectoryName))(BSTR *aName);
-
+    STDMETHOD(COMGETTER(Filter))(BSTR *aFilter);
+    STDMETHOD(Close)(void);
     STDMETHOD(Read)(IFsObjInfo **aInfo);
     /** @}  */
@@ -63 +66 @@
 private:
 
+    /** @name Private internal methods.
+     * @{ */
+    int parseData(GuestProcessStreamBlock &streamBlock);
+    /** @}  */
+
     struct Data
     {
-        GuestSession           *mParent;
-        Utf8Str                 mName;
-        ComPtr<IGuestFsObjInfo> mFsObjInfo;
+        GuestSession              *mParent;
+        Utf8Str                    mName;
+        Utf8Str                    mFilter;
+        uint32_t                   mFlags;
+        /** The stdout stream object which contains all
+         *  read out data for parsing. Must be persisent
+         *  between several read() calls. */
+        GuestProcessStream         mStream;
+        /** The guest process which is responsible for
+         *  getting the stdout stream. */
+        ComObjPtr<GuestProcess>    mProcess;
     } mData;
 };

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

@@ -42 +42 @@
     DECLARE_EMPTY_CTOR_DTOR(GuestFsObjInfo)
 
-    HRESULT init(void);
+    int     init(const GuestFsObjData &objData);
     void    uninit(void);
     HRESULT FinalConstruct(void);
@@ -55 +55 @@
     STDMETHOD(COMGETTER(ChangeTime))(LONG64 *aChangeTime);
     STDMETHOD(COMGETTER(DeviceNumber))(ULONG *aDeviceNumber);
-    STDMETHOD(COMGETTER(FileAttrs))(BSTR *aFileAttrs);
-    STDMETHOD(COMGETTER(GenerationID))(ULONG *aGenerationID);
+    STDMETHOD(COMGETTER(FileAttributes))(BSTR *aFileAttrs);
+    STDMETHOD(COMGETTER(GenerationId))(ULONG *aGenerationId);
     STDMETHOD(COMGETTER(GID))(ULONG *aGID);
     STDMETHOD(COMGETTER(GroupName))(BSTR *aGroupName);
@@ -62 +62 @@
     STDMETHOD(COMGETTER(ModificationTime))(LONG64 *aModificationTime);
     STDMETHOD(COMGETTER(Name))(BSTR *aName);
-    STDMETHOD(COMGETTER(NodeID))(LONG64 *aNodeID);
-    STDMETHOD(COMGETTER(NodeIDDevice))(ULONG *aNodeIDDevice);
-    STDMETHOD(COMGETTER(ObjectSize))(ULONG *aObjectSize);
+    STDMETHOD(COMGETTER(NodeId))(LONG64 *aNodeId);
+    STDMETHOD(COMGETTER(NodeIdDevice))(ULONG *aNodeIdDevice);
+    STDMETHOD(COMGETTER(ObjectSize))(LONG64 *aObjectSize);
     STDMETHOD(COMGETTER(Type))(FsObjType_T *aType);
     STDMETHOD(COMGETTER(UID))(ULONG *aUID);

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

@@ -74 +74 @@
     int callbackDispatcher(uint32_t uContextID, uint32_t uFunction, void *pvData, size_t cbData);
     inline bool callbackExists(uint32_t uContextID);
+    inline int checkPID(uint32_t uPID);
     void close(void);
     bool isReady(void);
@@ -83 +84 @@
     int terminateProcess(void);
     int waitFor(uint32_t fWaitFlags, ULONG uTimeoutMS, GuestProcessWaitResult &guestResult);
+    int waitForStart(uint32_t uTimeoutMS);
     int writeData(uint32_t uHandle, uint32_t uFlags, void *pvData, size_t cbData, uint32_t uTimeoutMS, uint32_t *puWritten);
     /** @}  */

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

@@ -157 +157 @@
     STDMETHOD(DirectoryCreateTemp)(IN_BSTR aTemplate, ULONG aMode, IN_BSTR aName, IGuestDirectory **aDirectory);
     STDMETHOD(DirectoryExists)(IN_BSTR aPath, BOOL *aExists);
-    STDMETHOD(DirectoryOpen)(IN_BSTR aPath, IN_BSTR aFilter, IN_BSTR aFlags, IGuestDirectory **aDirectory);
+    STDMETHOD(DirectoryOpen)(IN_BSTR aPath, IN_BSTR aFilter, ComSafeArrayIn(DirectoryOpenFlag_T, aFlags), IGuestDirectory **aDirectory);
     STDMETHOD(DirectoryQueryInfo)(IN_BSTR aPath, IGuestFsObjInfo **aInfo);
     STDMETHOD(DirectoryRemove)(IN_BSTR aPath);
@@ -205 +205 @@
     int                     directoryClose(ComObjPtr<GuestDirectory> pDirectory);
     int                     directoryCreateInternal(const Utf8Str &strPath, uint32_t uMode, uint32_t uFlags, ComObjPtr<GuestDirectory> &pDirectory);
+    int                     directoryOpenInternal(const Utf8Str &strPath, const Utf8Str &strFilter, uint32_t uFlags, ComObjPtr<GuestDirectory> &pDirectory);
     int                     dispatchToProcess(uint32_t uContextID, uint32_t uFunction, void *pvData, size_t cbData);
     int                     fileClose(ComObjPtr<GuestFile> pFile);

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

@@ -736 +736 @@
     int rc = VINF_SUCCESS;
     if (fDispatch)
+    {
         rc = pGuest->dispatchToSession(pHeader->u32ContextID, u32Function, pvParms, cbParms);
-
-#ifdef VBOX_WITH_GUEST_CONTROL_LEGACY
-    if (RT_SUCCESS(rc))
-        return rc;
+        if (RT_SUCCESS(rc))
+            return rc;
+    }
+
+#ifdef DEBUG
+    /* @todo Don't use legacy stuff in debug mode. Remove for final! */
+    return rc;
+#endif
 
     /* Legacy handling. */
@@ -794 +799 @@
             break;
     }
-#endif /* VBOX_WITH_GUEST_CONTROL_LEGACY */
 
     LogFlowFuncLeaveRC(rc);

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

@@ -593 +593 @@
                 {
 #ifdef DEBUG
-                    streamBlock.Dump();
+                    streamBlock.DumpToLog();
 #endif
                     hr = VBOX_E_FILE_ERROR;

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

@@ -581 +581 @@
 }
 
-int GuestFsObjData::From(const GuestProcessStreamBlock &strmBlk)
-{
+int GuestFsObjData::FromLs(const GuestProcessStreamBlock &strmBlk)
+{
+    LogFlowFuncEnter(("\n"));
+
     int rc = VINF_SUCCESS;
 
     try
     {
+#ifdef DEBUG
+        strmBlk.DumpToLog();
+#endif
+        /* Object name. */
+        mName = strmBlk.GetString("name");
+        if (mName.isEmpty()) throw VERR_NOT_FOUND;
+        /* Type. */
         Utf8Str strType(strmBlk.GetString("ftype"));
         if (strType.equalsIgnoreCase("-"))
@@ -595 +604 @@
         else
             mType = FsObjType_Undefined;
-
+        /* Object size. */
         rc = strmBlk.GetInt64Ex("st_size", &mObjectSize);
         if (RT_FAILURE(rc)) throw rc;
-
-        /** @todo Add complete GuestFsObjData info! */
+        /** @todo Add complete ls info! */
     }
     catch (int rc2)
@@ -606 +614 @@
     }
 
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
+int GuestFsObjData::FromStat(const GuestProcessStreamBlock &strmBlk)
+{
+    LogFlowFuncEnter(("\n"));
+
+    int rc = VINF_SUCCESS;
+
+    try
+    {
+#ifdef DEBUG
+        strmBlk.DumpToLog();
+#endif
+        /* Node ID. */
+        rc = strmBlk.GetInt64Ex("node_id", &mNodeID);
+        if (RT_FAILURE(rc)) throw rc;
+        /* Object name. */
+        mName = strmBlk.GetString("name");
+        if (mName.isEmpty()) throw VERR_NOT_FOUND;
+        /* Type. */
+        Utf8Str strType(strmBlk.GetString("ftype"));
+        if (strType.equalsIgnoreCase("-"))
+            mType = FsObjType_File;
+        else if (strType.equalsIgnoreCase("d"))
+            mType = FsObjType_Directory;
+        /** @todo Add more types! */
+        else
+            mType = FsObjType_Undefined;
+        /* Object size. */
+        rc = strmBlk.GetInt64Ex("st_size", &mObjectSize);
+        if (RT_FAILURE(rc)) throw rc;
+        /** @todo Add complete stat info! */
+    }
+    catch (int rc2)
+    {
+        rc = rc2;
+    }
+
+    LogFlowFuncLeaveRC(rc);
     return rc;
 }
@@ -650 +699 @@
 
 #ifdef DEBUG
-void GuestProcessStreamBlock::Dump(void)
+void GuestProcessStreamBlock::DumpToLog(void) const
 {
     LogFlowFunc(("Dumping contents of stream block=0x%p (%ld items):\n",

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

@@ -22 +22 @@
 *******************************************************************************/
 #include "GuestDirectoryImpl.h"
+#include "GuestSessionImpl.h"
 #include "GuestCtrlImplPrivate.h"
 
@@ -52 +53 @@
 /////////////////////////////////////////////////////////////////////////////
 
-int GuestDirectory::init(GuestSession *aSession, const Utf8Str &strPath)
-{
+int GuestDirectory::init(GuestSession *aSession,
+                         const Utf8Str &strPath, const Utf8Str &strFilter /*= ""*/, uint32_t uFlags /*= 0*/)
+{
+    LogFlowThisFunc(("strPath=%s, strFilter=%s, uFlags=%x\n",
+                     strPath.c_str(), strFilter.c_str(), uFlags));
+
     /* Enclose the state transition NotReady->InInit->Ready. */
     AutoInitSpan autoInitSpan(this);
@@ -59 +64 @@
 
     mData.mParent = aSession;
-    mData.mName = strPath;
-
-    /* Confirm a successful initialization when it's the case. */
-    autoInitSpan.setSucceeded();
-
-    return VINF_SUCCESS;
+    mData.mName   = strPath;
+    mData.mFilter = strFilter;
+    mData.mFlags  = uFlags;
+
+    /* Start the directory process on the guest. */
+    GuestProcessStartupInfo procInfo;
+    procInfo.mName      = Utf8StrFmt(tr("Reading directory \"%s\"", strPath.c_str()));
+    procInfo.mCommand   = Utf8Str(VBOXSERVICE_TOOL_LS);
+    procInfo.mTimeoutMS = 0; /* No timeout. */
+    procInfo.mFlags     = ProcessCreateFlag_Hidden | ProcessCreateFlag_WaitForStdOut;
+
+    procInfo.mArguments.push_back(Utf8Str("--machinereadable"));
+    /* We want the long output format which contains all the object details. */
+    procInfo.mArguments.push_back(Utf8Str("-l"));
+#if 0 /* Flags are not supported yet. */
+    if (uFlags & DirectoryOpenFlag_NoSymlinks)
+        procInfo.mArguments.push_back(Utf8Str("--nosymlinks")); /** @todo What does GNU here? */
+#endif
+    /** @todo Recursion support? */
+    procInfo.mArguments.push_back(strPath); /* The directory we want to open. */
+
+    /*
+     * Start the process asynchronously and keep it around so that we can use
+     * it later in subsequent read() calls.
+     */
+    int rc = mData.mParent->processCreateExInteral(procInfo, mData.mProcess);
+    if (RT_SUCCESS(rc))
+        rc = mData.mProcess->startProcessAsync();
+
+    LogFlowThisFunc(("rc=%Rrc\n", rc));
+
+    if (RT_SUCCESS(rc))
+    {
+        /* Confirm a successful initialization when it's the case. */
+        autoInitSpan.setSucceeded();
+        return rc;
+    }
+
+    autoInitSpan.setFailed();
+    return rc;
 }
 
@@ -79 +118 @@
     if (autoUninitSpan.uninitDone())
         return;
+
+    if (!mData.mProcess.isNull())
+        mData.mProcess->uninit();
 }
 
@@ -100 +142 @@
 }
 
+STDMETHODIMP GuestDirectory::COMGETTER(Filter)(BSTR *aFilter)
+{
+    LogFlowThisFuncEnter();
+
+    CheckComArgOutPointerValid(aFilter);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    mData.mFilter.cloneTo(aFilter);
+
+    return S_OK;
+}
+
+// private methods
+/////////////////////////////////////////////////////////////////////////////
+
+int GuestDirectory::parseData(GuestProcessStreamBlock &streamBlock)
+{
+    LogFlowThisFunc(("cbStream=%RU32\n", mData.mStream.GetSize()));
+
+    int rc;
+    do
+    {
+        /* Try parsing the data to see if the current block is complete. */
+        rc = mData.mStream.ParseBlock(streamBlock);
+        if (streamBlock.GetCount())
+            break;
+
+    } while (RT_SUCCESS(rc));
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
+
 // implementation of public methods
 /////////////////////////////////////////////////////////////////////////////
 
-STDMETHODIMP GuestDirectory::Read(IFsObjInfo **aInfo)
+STDMETHODIMP GuestDirectory::Close(void)
 {
 #ifndef VBOX_WITH_GUEST_CONTROL
     ReturnComNotImplemented();
 #else
+    LogFlowThisFuncEnter();
+
+    uninit();
+
+    return S_OK;
+#endif /* VBOX_WITH_GUEST_CONTROL */
+}
+
+STDMETHODIMP GuestDirectory::Read(IFsObjInfo **aInfo)
+{
+#ifndef VBOX_WITH_GUEST_CONTROL
+    ReturnComNotImplemented();
+#else
+    LogFlowThisFuncEnter();
+
     AutoCaller autoCaller(this);
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    ReturnComNotImplemented();
+    ComObjPtr<GuestProcess> pProcess = mData.mProcess;
+    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 */);
+            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 (;;)
+            {
+                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)
+                {
+                    break;
+                }
+
+                rc = pProcess->readData(OUTPUT_HANDLE_ID_STDOUT, sizeof(byBuf),
+                                        30 * 1000 /* Timeout */, byBuf, sizeof(byBuf),
+                                        &cbRead);
+                if (RT_FAILURE(rc))
+                    break;
+
+                if (cbRead)
+                {
+                    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;
+                    }
+                }
+            }
+
+            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;
+                HRESULT 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. */
+                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);
+
+    LogFlowFuncLeaveRC(rc);
+    return hr;
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }

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

@@ -52 +52 @@
 /////////////////////////////////////////////////////////////////////////////
 
-HRESULT GuestFsObjInfo::init(void)
-{
-    return S_OK;
+int GuestFsObjInfo::init(const GuestFsObjData &objData)
+{
+    LogFlowThisFuncEnter();
+
+    /* Enclose the state transition NotReady->InInit->Ready. */
+    AutoInitSpan autoInitSpan(this);
+    AssertReturn(autoInitSpan.isOk(), E_FAIL);
+
+    mData = objData;
+
+    /* Confirm a successful initialization when it's the case. */
+    autoInitSpan.setSucceeded();
+
+    return VINF_SUCCESS;
 }
 
@@ -82 +93 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    ReturnComNotImplemented();
+    CheckComArgOutPointerValid(aAccessTime);
+
+    *aAccessTime = mData.mAccessTime;
+
+    return S_OK;
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }
@@ -94 +109 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    ReturnComNotImplemented();
+    CheckComArgOutPointerValid(aAllocatedSize);
+
+    *aAllocatedSize = mData.mAllocatedSize;
+
+    return S_OK;
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }
@@ -106 +125 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    ReturnComNotImplemented();
+    CheckComArgOutPointerValid(aBirthTime);
+
+    *aBirthTime = mData.mBirthTime;
+
+    return S_OK;
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }
@@ -118 +141 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    ReturnComNotImplemented();
+    CheckComArgOutPointerValid(aChangeTime);
+
+    *aChangeTime = mData.mChangeTime;
+
+    return S_OK;
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }
@@ -130 +157 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    ReturnComNotImplemented();
-#endif /* VBOX_WITH_GUEST_CONTROL */
-}
-
-STDMETHODIMP GuestFsObjInfo::COMGETTER(FileAttrs)(BSTR *aFileAttrs)
-{
-#ifndef VBOX_WITH_GUEST_CONTROL
-    ReturnComNotImplemented();
-#else
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    ReturnComNotImplemented();
-#endif /* VBOX_WITH_GUEST_CONTROL */
-}
-
-STDMETHODIMP GuestFsObjInfo::COMGETTER(GenerationID)(ULONG *aGenerationID)
-{
-#ifndef VBOX_WITH_GUEST_CONTROL
-    ReturnComNotImplemented();
-#else
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    ReturnComNotImplemented();
+    CheckComArgOutPointerValid(aDeviceNumber);
+
+    *aDeviceNumber = mData.mDeviceNumber;
+
+    return S_OK;
+#endif /* VBOX_WITH_GUEST_CONTROL */
+}
+
+STDMETHODIMP GuestFsObjInfo::COMGETTER(FileAttributes)(BSTR *aAttributes)
+{
+#ifndef VBOX_WITH_GUEST_CONTROL
+    ReturnComNotImplemented();
+#else
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    CheckComArgOutPointerValid(aAttributes);
+
+    mData.mFileAttrs.cloneTo(aAttributes);
+
+    return S_OK;
+#endif /* VBOX_WITH_GUEST_CONTROL */
+}
+
+STDMETHODIMP GuestFsObjInfo::COMGETTER(GenerationId)(ULONG *aGenerationId)
+{
+#ifndef VBOX_WITH_GUEST_CONTROL
+    ReturnComNotImplemented();
+#else
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    CheckComArgOutPointerValid(aGenerationId);
+
+    *aGenerationId = mData.mGenerationID;
+
+    return S_OK;
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }
@@ -166 +205 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    ReturnComNotImplemented();
+    CheckComArgOutPointerValid(aGID);
+
+    *aGID = mData.mGID;
+
+    return S_OK;
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }
@@ -178 +221 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    ReturnComNotImplemented();
+    CheckComArgOutPointerValid(aGroupName);
+
+    mData.mGroupName.cloneTo(aGroupName);
+
+    return S_OK;
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }
@@ -190 +237 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    ReturnComNotImplemented();
+    CheckComArgOutPointerValid(aHardLinks);
+
+    *aHardLinks = mData.mNumHardLinks;
+
+    return S_OK;
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }
@@ -202 +253 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    ReturnComNotImplemented();
+    CheckComArgOutPointerValid(aModificationTime);
+
+    *aModificationTime = mData.mModificationTime;
+
+    return S_OK;
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }
@@ -214 +269 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    ReturnComNotImplemented();
-#endif /* VBOX_WITH_GUEST_CONTROL */
-}
-
-STDMETHODIMP GuestFsObjInfo::COMGETTER(NodeID)(LONG64 *aNodeID)
-{
-#ifndef VBOX_WITH_GUEST_CONTROL
-    ReturnComNotImplemented();
-#else
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    ReturnComNotImplemented();
-#endif /* VBOX_WITH_GUEST_CONTROL */
-}
-
-STDMETHODIMP GuestFsObjInfo::COMGETTER(NodeIDDevice)(ULONG *aNodeIDDevice)
-{
-#ifndef VBOX_WITH_GUEST_CONTROL
-    ReturnComNotImplemented();
-#else
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    ReturnComNotImplemented();
-#endif /* VBOX_WITH_GUEST_CONTROL */
-}
-
-STDMETHODIMP GuestFsObjInfo::COMGETTER(ObjectSize)(ULONG *aObjectSize)
-{
-#ifndef VBOX_WITH_GUEST_CONTROL
-    ReturnComNotImplemented();
-#else
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    ReturnComNotImplemented();
+    CheckComArgOutPointerValid(aName);
+
+    mData.mName.cloneTo(aName);
+
+    return S_OK;
+#endif /* VBOX_WITH_GUEST_CONTROL */
+}
+
+STDMETHODIMP GuestFsObjInfo::COMGETTER(NodeId)(LONG64 *aNodeId)
+{
+#ifndef VBOX_WITH_GUEST_CONTROL
+    ReturnComNotImplemented();
+#else
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    CheckComArgOutPointerValid(aNodeId);
+
+    *aNodeId = mData.mNodeID;
+
+    return S_OK;
+#endif /* VBOX_WITH_GUEST_CONTROL */
+}
+
+STDMETHODIMP GuestFsObjInfo::COMGETTER(NodeIdDevice)(ULONG *aNodeIdDevice)
+{
+#ifndef VBOX_WITH_GUEST_CONTROL
+    ReturnComNotImplemented();
+#else
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    CheckComArgOutPointerValid(aNodeIdDevice);
+
+    *aNodeIdDevice = mData.mNodeIDDevice;
+
+    return S_OK;
+#endif /* VBOX_WITH_GUEST_CONTROL */
+}
+
+STDMETHODIMP GuestFsObjInfo::COMGETTER(ObjectSize)(LONG64 *aObjectSize)
+{
+#ifndef VBOX_WITH_GUEST_CONTROL
+    ReturnComNotImplemented();
+#else
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    CheckComArgOutPointerValid(aObjectSize);
+
+    *aObjectSize = mData.mObjectSize;
+
+    return S_OK;
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }
@@ -262 +333 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    ReturnComNotImplemented();
+    CheckComArgOutPointerValid(aType);
+
+    *aType = mData.mType;
+
+    return S_OK;
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }
@@ -274 +349 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    ReturnComNotImplemented();
+    CheckComArgOutPointerValid(aUID);
+
+    *aUID = mData.mUID;
+
+    return S_OK;
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }
@@ -286 +365 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    ReturnComNotImplemented();
+    CheckComArgOutPointerValid(aUserFlags);
+
+    *aUserFlags = mData.mUserFlags;
+
+    return S_OK;
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }
@@ -298 +381 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    ReturnComNotImplemented();
+    CheckComArgOutPointerValid(aUserName);
+
+    mData.mUserName.cloneTo(aUserName);
+
+    return S_OK;
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }
@@ -310 +397 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    ReturnComNotImplemented();
-#endif /* VBOX_WITH_GUEST_CONTROL */
-}
-
+    CheckComArgOutPointerValid(aACL);
+
+    mData.mACL.cloneTo(aACL);
+
+    return S_OK;
+#endif /* VBOX_WITH_GUEST_CONTROL */
+}
+

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

@@ -498 +498 @@
 }
 
+/**
+ * Checks if the current assigned PID matches another PID (from a callback).
+ *
+ * In protocol v1 we don't have the possibility to terminate/kill
+ * processes so it can happen that a formerly start process A
+ * (which has the context ID 0 (session=0, process=0, count=0) will
+ * send a delayed message to the host if this process has already
+ * been discarded there and the same context ID was reused by
+ * a process B. Process B in turn then has a different guest PID.
+ *
+ * @return  IPRT status code.
+ * @param   uPID                    PID to check.
+ */
+inline int GuestProcess::checkPID(uint32_t uPID)
+{
+    /* Was there a PID assigned yet? */
+    if (mData.mPID)
+    {
+        /*
+
+         */
+        if (mData.mParent->getProtocolVersion() < 2)
+        {
+            /* Simply ignore the stale requests. */
+            return (mData.mPID == uPID)
+                   ? VINF_SUCCESS : VERR_NOT_FOUND;
+        }
+        /* This should never happen! */
+        AssertReleaseMsg(mData.mPID == uPID, ("Unterminated guest process (PID %RU32) sent data to a newly started process (PID %RU32)\n",
+                                              uPID, mData.mPID));
+    }
+
+    return VINF_SUCCESS;
+}
+
+/* Do not hold any locks here because the lock validator will be unhappy
+ * when being in uninit(). */
+void GuestProcess::close(void)
+{
+    LogFlowThisFuncEnter();
+
+    uninit();
+
+    LogFlowThisFuncLeave();
+}
+
 inline bool GuestProcess::isAlive(void)
 {
@@ -503 +549 @@
             || mData.mStatus == ProcessStatus_Paused
             || mData.mStatus == ProcessStatus_Terminating);
-}
-
-/* Do not hold any locks here because the lock validator will be unhappy
- * when being in uninit(). */
-void GuestProcess::close(void)
-{
-    LogFlowThisFuncEnter();
-
-    uninit();
-
-    LogFlowThisFuncLeave();
 }
 
@@ -565 +600 @@
                      mData.mPID, pData->u32Status, pData->u32Flags, pData->cbProcessed, pCallback, pData));
 
-    int rc = VINF_SUCCESS;
+    int rc = checkPID(pData->u32PID);
+    if (RT_FAILURE(rc))
+        return rc;
 
     /* First, signal callback in every case (if available). */
@@ -607 +644 @@
                      pData->u32PID, pData->u32Status, pData->u32Flags, pCallback, pData));
 
-    int rc = VINF_SUCCESS;
-
-    /* Get data from the callback payload. */
-    if (mData.mPID)
-        Assert(mData.mPID == pData->u32PID);
+    int rc = checkPID(pData->u32PID);
+    if (RT_FAILURE(rc))
+        return rc;
 
     BOOL fSignal = FALSE;
@@ -791 +826 @@
                      mData.mPID, pData->u32HandleId, pData->u32Flags, pData->pvData, pData->cbData, pCallback, pData));
 
-    /* Copy data into callback (if any). */
-    int rc = VINF_SUCCESS;
+    int rc = checkPID(pData->u32PID);
+    if (RT_FAILURE(rc))
+        return rc;
 
     /* First, signal callback in every case (if available). */
@@ -1229 +1265 @@
             case ProcessStatus_Down:
                 waitRes.mResult = ProcessWaitResult_Terminate;
+                waitRes.mRC = mData.mRC;
                 break;
 
@@ -1234 +1271 @@
             case ProcessStatus_TimedOutAbnormally:
                 waitRes.mResult = ProcessWaitResult_Timeout;
+                waitRes.mRC = mData.mRC;
                 break;
 
@@ -1271 +1309 @@
                 break;
 
+            case ProcessStatus_TimedOutKilled:
+            case ProcessStatus_TimedOutAbnormally:
+                waitRes.mResult = ProcessWaitResult_Timeout;
+                waitRes.mRC = mData.mRC;
+                break;
+
             case ProcessStatus_Undefined:
             case ProcessStatus_Starting:
@@ -1310 +1354 @@
 
     mData.mWaitCount--;
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
+int GuestProcess::waitForStart(uint32_t uTimeoutMS)
+{
+    LogFlowThisFunc(("uTimeoutMS=%RU32\n", uTimeoutMS));
+
+    int rc = VINF_SUCCESS;
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    if (mData.mStatus != ProcessStatus_Started)
+    {
+        alock.release();
+
+        GuestProcessWaitResult waitRes;
+        int rc = waitFor(ProcessWaitForFlag_Start, uTimeoutMS, waitRes);
+        if (   RT_FAILURE(rc)
+            || (    waitRes.mResult == ProcessWaitResult_Start
+                &&  waitRes.mResult == ProcessWaitResult_Any
+               )
+           )
+        {
+            if (RT_SUCCESS(rc))
+                rc = waitRes.mRC;
+        }
+    }
 
     LogFlowFuncLeaveRC(rc);

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

@@ -1092 +1092 @@
 }
 
+int GuestSession::directoryOpenInternal(const Utf8Str &strPath, const Utf8Str &strFilter,
+                                        uint32_t uFlags, ComObjPtr<GuestDirectory> &pDirectory)
+{
+    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 */,
+                              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;
+    }
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
 int GuestSession::dispatchToProcess(uint32_t uContextID, uint32_t uFunction, void *pvData, size_t cbData)
 {
@@ -1198 +1232 @@
         size_t cbRead = 0;
 
+        /** @todo Merge with GuestDirectory::read. */
         for (;;)
         {
@@ -1234 +1269 @@
         if (RT_SUCCESS(rc))
         {
-            rc = objData.From(streamBlock);
+            rc = objData.FromStat(streamBlock);
         }
         else
@@ -1818 +1853 @@
 }
 
-STDMETHODIMP GuestSession::DirectoryOpen(IN_BSTR aPath, IN_BSTR aFilter, IN_BSTR aFlags, IGuestDirectory **aDirectory)
-{
-#ifndef VBOX_WITH_GUEST_CONTROL
-    ReturnComNotImplemented();
-#else
-    LogFlowThisFuncEnter();
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    ReturnComNotImplemented();
+STDMETHODIMP GuestSession::DirectoryOpen(IN_BSTR aPath, IN_BSTR aFilter, ComSafeArrayIn(DirectoryOpenFlag_T, aFlags), IGuestDirectory **aDirectory)
+{
+#ifndef VBOX_WITH_GUEST_CONTROL
+    ReturnComNotImplemented();
+#else
+    LogFlowThisFuncEnter();
+
+    if (RT_UNLIKELY((aPath) == NULL || *(aPath) == '\0'))
+        return setError(E_INVALIDARG, tr("No directory to open specified"));
+    if (RT_UNLIKELY((aFilter) != NULL && *(aFilter) != '\0'))
+        return setError(E_INVALIDARG, tr("Directory filters not implemented yet"));
+
+    CheckComArgOutPointerValid(aDirectory);
+
+    AutoCaller autoCaller(this);
+    if (FAILED(autoCaller.rc())) return autoCaller.rc();
+
+    uint32_t fFlags = DirectoryOpenFlag_None;
+    if (aFlags)
+    {
+        com::SafeArray<DirectoryOpenFlag_T> flags(ComSafeArrayInArg(aFlags));
+        for (size_t i = 0; i < flags.size(); i++)
+            fFlags |= flags[i];
+
+        if (fFlags)
+            return setError(E_INVALIDARG, tr("Open flags (%#x) not implemented yet"), fFlags);
+    }
+
+    HRESULT hr = S_OK;
+
+    ComObjPtr <GuestDirectory> pDirectory;
+    int rc = directoryOpenInternal(Utf8Str(aPath), Utf8Str(aFilter), fFlags, pDirectory);
+    if (RT_SUCCESS(rc))
+    {
+        if (aDirectory)
+        {
+            /* Return directory object to the caller. */
+            hr = pDirectory.queryInterfaceTo(aDirectory);
+        }
+        else
+        {
+            rc = directoryClose(pDirectory);
+            if (RT_FAILURE(rc))
+                hr = setError(VBOX_E_IPRT_ERROR, tr("Unable to close directory object, rc=%Rrc"), rc);
+        }
+    }
+    else
+    {
+        switch (rc)
+        {
+            case VERR_INVALID_PARAMETER:
+               hr = setError(VBOX_E_IPRT_ERROR, tr("Opening directory failed: Invalid parameters given"));
+               break;
+
+            case VERR_BROKEN_PIPE:
+               hr = setError(VBOX_E_IPRT_ERROR, tr("Opening directory failed: Unexpectedly aborted"));
+               break;
+
+            default:
+               hr = setError(VBOX_E_IPRT_ERROR, tr("Opening directory failed: %Rrc"), rc);
+               break;
+        }
+    }
+
+    return hr;
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }
@@ -2103 +2192 @@
         LogFlowThisFunc(("rc=%Rrc, cbRead=%RU32, cbStreamOut=%RU32\n",
                          rc, cbRead, streamOut.GetSize()));
-    } 
+    }
 
     if (RT_FAILURE(rc))