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

Timestamp:

Mar 21, 2023 12:15:00 PM (23 months ago)

Author:

vboxsync

Message:

Guest Control: Added directory listing support via IDirectory::list(). Added (randomized) testcase support for it. bugref:9783

Location:

trunk/src/VBox/Main/include

Files:

• GuestCtrlImplPrivate.h (modified) (3 diffs)
• GuestDirectoryImpl.h (modified) (3 diffs)

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

@@ -1457 +1457 @@
 
 
-/*******************************************************************************
-* Callback data structures.                                                    *
-*                                                                              *
-* These structures make up the actual low level HGCM callback data sent from   *
-* the guest back to the host.                                                  *
-*******************************************************************************/
+/*********************************************************************************************************************************
+ * Callback data structures.                                                                                                     *
+ *                                                                                                                               *
+ * These structures make up the actual low level HGCM callback data sent from                                                    *
+ * the guest back to the host.                                                                                                   *
+ ********************************************************************************************************************************/
 
 /**
@@ -1636 +1636 @@
 
 /**
+ * Callback data for a single GSTCTLDIRENTRYEX entry.
+ */
+typedef struct CALLBACKDATA_DIR_ENTRY
+{
+    /** Pointer to directory entry information. */
+    PGSTCTLDIRENTRYEX pDirEntryEx;
+    /** Size (in bytes) of directory entry information. */
+    uint32_t          cbDirEntryEx;
+    /** Resolved user name.
+     *  This is the object owner for UNIX-y Oses. */
+    char             *pszUser;
+    /** Size (in bytes) of \a pszUser. */
+    uint32_t          cbUser;
+    /** Resolved user group(s). */
+    char             *pszGroups;
+    /** Size (in bytes) of \a pszGroups. */
+    uint32_t          cbGroups;
+} CALLBACKDATA_DIR_ENTRY;
+/** Pointer to a CALLBACKDATA_DIR_ENTRY struct. */
+typedef CALLBACKDATA_DIR_ENTRY *PCALLBACKDATA_DIR_ENTRY;
+
+/**
  * Callback data for guest directory operations.
  */
@@ -1661 +1683 @@
         struct
         {
-            /** Pointer to directory entry information. */
-            PGSTCTLDIRENTRYEX pEntry;
-            /** Size (in bytes) of directory entry information. */
-            uint32_t          cbEntry;
-            /** Resolved user name.
-             *  This is the object owner for UNIX-y Oses. */
-            char             *pszUser;
-            /** Size (in bytes) of \a pszUser. */
-            uint32_t          cbUser;
-            /** Resolved user group(s). */
-            char             *pszGroups;
-            /** Size (in bytes) of \a pszGroups. */
-            uint32_t          cbGroups;
+            /** Single entry read. */
+            CALLBACKDATA_DIR_ENTRY Entry;
         } read;
+        struct
+        {
+            /** Number of entries in \a paEntries. */
+            uint32_t                 cEntries;
+            /** Array of entries read. */
+            CALLBACKDATA_DIR_ENTRY **paEntries;
+        } list;
     } u;
 } CALLBACKDATA_DIR_NOTIFY;

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

@@ -72 +72 @@
     EventSource   *i_getEventSource(void) { return mEventSource; }
     int            i_onDirNotify(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, PVBOXGUESTCTRLHOSTCALLBACK pSvcCbData);
+    int            i_listInternal(uint32_t cMaxEntries, uint32_t fFlags, std::vector<GuestFsObjData> &vecObjData, int *pvrcGuest);
+    int            i_listEx(uint32_t cMaxEntries, uint32_t fFlags, std::vector<ComObjPtr<GuestFsObjInfo>> &vecObjInfo, int *pvrcGuest);
+    int            i_list(uint32_t cMaxEntries, std::vector<ComObjPtr<GuestFsObjInfo>> &vecObjInfo, int *pvrcGuest);
     int            i_read(ComObjPtr<GuestFsObjInfo> &fsObjInfo, int *pvrcGuest);
     int            i_readInternal(GuestFsObjData &objData, int *pvrcGuest);
@@ -89 +92 @@
      * @{ */
     static Utf8Str i_guestErrorToString(int vrcGuest, const char *pcszWhat);
+    static void    i_dirNotifyDataDestroy(PCALLBACKDATA_DIR_NOTIFY pDirNotify);
     /** @}  */
 
@@ -105 +109 @@
     HRESULT getId(ULONG *aId);
     HRESULT getStatus(DirectoryStatus_T *aStatus);
+    HRESULT list(ULONG aMaxEntries, std::vector<ComPtr<IFsObjInfo> > &aObjInfos);
     HRESULT read(ComPtr<IFsObjInfo> &aObjInfo);
     HRESULT rewind(void);