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

Timestamp:

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

Author:

vboxsync

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

79873

Message:

Guest Control 2.0: Update.

Location:

trunk/src/VBox/Main/include

Files:

• GuestCtrlImplPrivate.h (modified) (3 diffs)
• GuestDirectoryImpl.h (modified) (4 diffs)
• GuestFsObjInfoImpl.h (modified) (3 diffs)
• GuestProcessImpl.h (modified) (2 diffs)
• GuestSessionImpl.h (modified) (2 diffs)

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);