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

Timestamp:

Aug 2, 2012 12:11:44 PM (13 years ago)

Author:

vboxsync

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

79703

Message:

Guest Control 2.0: Update.

Location:

trunk/src/VBox/Main/include

Files:

• GuestCtrlImplPrivate.h (modified) (9 diffs)
• GuestFsObjInfoImpl.h (modified) (2 diffs)
• GuestSessionImpl.h (modified) (1 diff)

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

@@ -72 +72 @@
 typedef std::vector <Utf8Str> ProcessArguments;
 
+class GuestProcessStreamBlock;
+
 
 /**
@@ -116 +118 @@
     int                         mRC;
 };
+
 
 /*
@@ -174 +177 @@
 };
 
+
 /*
  * Class representing a guest control process event.
@@ -207 +211 @@
 };
 
+
 /**
  * Simple structure mantaining guest credentials.
@@ -217 +222 @@
 };
 
+
 typedef std::vector <Utf8Str> GuestEnvironmentArray;
 class GuestEnvironment
@@ -259 +265 @@
 
     std::map <Utf8Str, Utf8Str> mEnvironment;
+};
+
+
+/**
+ * Structure representing information of a
+ * file system object.
+ */
+struct GuestFsObjData
+{
+    /** Helper function to extract the data from
+     *  a guest stream block. */
+    int From(const GuestProcessStreamBlock &strmBlk);
+
+    int64_t              mAccessTime;
+    int64_t              mAllocatedSize;
+    int64_t              mBirthTime;
+    int64_t              mChangeTime;
+    uint32_t             mDeviceNumber;
+    Utf8Str              mFileAttrs;
+    uint32_t             mGenerationID;
+    uint32_t             mGID;
+    Utf8Str              mGroupName;
+    uint32_t             mNumHardLinks;
+    int64_t              mModificationTime;
+    Utf8Str              mName;
+    int64_t              mNodeID;
+    uint32_t             mNodeIDDevice;
+    int64_t              mObjectSize;
+    FsObjType_T          mType;
+    uint32_t             mUID;
+    uint32_t             mUserFlags;
+    Utf8Str              mUserName;
+    Utf8Str              mACL;
 };
 
@@ -281 +320 @@
 };
 
+
 /**
  * Class representing the "value" side of a "key=value" pair.
@@ -313 +353 @@
 public:
 
-    GuestProcessStreamBlock();
-
-    //GuestProcessStreamBlock(GuestProcessStreamBlock &);
-
-    virtual ~GuestProcessStreamBlock();
+    GuestProcessStreamBlock(void);
+
+    virtual ~GuestProcessStreamBlock(void);
 
 public:
@@ -327 +365 @@
 #endif
 
-    int GetInt64Ex(const char *pszKey, int64_t *piVal);
-
-    int64_t GetInt64(const char *pszKey);
-
-    size_t GetCount();
-
-    const char* GetString(const char *pszKey);
-
-    int GetUInt32Ex(const char *pszKey, uint32_t *puVal);
-
-    uint32_t GetUInt32(const char *pszKey);
+    int GetInt64Ex(const char *pszKey, int64_t *piVal) const;
+
+    int64_t GetInt64(const char *pszKey) const;
+
+    size_t GetCount(void) const;
+
+    const char* GetString(const char *pszKey) const;
+
+    int GetUInt32Ex(const char *pszKey, uint32_t *puVal) const;
+
+    uint32_t GetUInt32(const char *pszKey) const;
 
     int SetValue(const char *pszKey, const char *pszValue);

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

@@ -21 +21 @@
 
 #include "VirtualBoxBase.h"
+#include "GuestCtrlImplPrivate.h"
 
 /**
@@ -78 +79 @@
 private:
 
-    struct Data
-    {
-        LONG64               mAccessTime;
-        LONG64               mAllocatedSize;
-        LONG64               mBirthTime;
-        LONG64               mChangeTime;
-        ULONG                mDeviceNumber;
-        Utf8Str              mFileAttrs;
-        ULONG                mGenerationID;
-        ULONG                mGID;
-        Utf8Str              mGroupName;
-        ULONG                mNumHardLinks;
-        LONG64               mModificationTime;
-        Utf8Str              mName;
-        LONG64               mNodeID;
-        ULONG                mNodeIDDevice;
-        LONG64               mObjectSize;
-        FsObjType            mType;
-        ULONG                mUID;
-        ULONG                mUserFlags;
-        Utf8Str              mUserName;
-        Utf8Str              mACL;
-    } mData;
+    GuestFsObjData mData;
 };
 

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

@@ -127 +127 @@
     int                     dispatchToProcess(uint32_t uContextID, uint32_t uFunction, void *pvData, size_t cbData);
     int                     fileClose(ComObjPtr<GuestFile> pFile);
+    int                     fileQueryInfoInternal(const Utf8Str &strPath, GuestFsObjData &objData);
+    int                     fileQuerySizeInternal(const Utf8Str &strPath, int64_t *pllSize);
     const GuestCredentials &getCredentials(void);
     const GuestEnvironment &getEnvironment(void);