Changeset 98824 in vbox for trunk/include/VBox

Timestamp:

Mar 2, 2023 5:06:36 PM (2 years ago)

Author:

vboxsync

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

156144

Message:

Guest Control: Made the directory entry reading really dynamic by letting the guest tell us the size it reports to the guest (limited by GSTCTL_DIRENTRY_MAX_SIZE). Re-introduced the #pragma pack(1) because we need the structures on mixed bitness (32 / 64 or vice versa) with the same size. bugref:9783

Location:

trunk/include/VBox

Files:

• GuestHost/GuestControl.h (modified) (3 diffs)
• HostServices/GuestControlSvc.h (modified) (1 diff)
• VBoxGuestLib.h (modified) (1 diff)

trunk/include/VBox/GuestHost/GuestControl.h

@@ -303 +303 @@
  * Additional Unix Attributes (GSTCTLFSOBJATTRADD_UNIX).
  */
+#pragma pack(1)
 typedef struct GSTCTLFSOBJATTRUNIX
 {
@@ -344 +345 @@
     RTDEV           Device;
 } GSTCTLFSOBJATTRUNIX;
+#pragma pack()
+AssertCompileSize(GSTCTLFSOBJATTRUNIX, 36);
 
 /**
@@ -549 +552 @@
 typedef GSTCTLDIRENTRYEX const *PCGSTCTLDIRENTRYEX;
 
-/** The maximum size (in bytes) of a GSTCTLDIRENTRYEX (includes dynamic szName[pDirEntry->cbName + 1]). */
-#define GSTCTL_DIRENTRY_MAX_SIZE    (sizeof(GSTCTLDIRENTRYEX) + RTPATH_MAX)
+/** The maximum size (in bytes) of an entry file name (at least RT_UOFFSETOF(GSTCTLDIRENTRYEX, szName[2]). */
+#define GSTCTL_DIRENTRY_MAX_SIZE    4096
 
 } /* namespace guestControl */

trunk/include/VBox/HostServices/GuestControlSvc.h

@@ -1063 +1063 @@
     /** Handle of directory listing to read the next entry for. */
     HGCMFunctionParameter handle;
-    /** Maximum directory entry size (in bytes) to use.
-     *  @sa GSTCTL_DIRENTRY_MAX_SIZE */
-    HGCMFunctionParameter max_entry_size;
 } HGCMMsgDirRead;
 

trunk/include/VBox/VBoxGuestLib.h

@@ -1120 +1120 @@
 VBGLR3DECL(int) VbglR3GuestCtrlDirGetOpen(PVBGLR3GUESTCTRLCMDCTX pCtx, char *pszPath, uint32_t cbPath, uint32_t *pfFlags, GSTCTLDIRFILTER *penmFilter, GSTCTLFSOBJATTRADD *penmReadAttrAdd, uint32_t *pfReadFlags);
 VBGLR3DECL(int) VbglR3GuestCtrlDirGetClose(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t *puHandle);
-VBGLR3DECL(int) VbglR3GuestCtrlDirGetRead(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t *puHandle, uint32_t *pcbDirEntry);
+VBGLR3DECL(int) VbglR3GuestCtrlDirGetRead(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t *puHandle);
 VBGLR3DECL(int) VbglR3GuestCtrlDirGetRewind(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t *puHandle);
 /** @} */