Changeset 98824 in vbox for trunk/src/VBox/Additions/common/VBoxGuest

Timestamp:

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

Author:

vboxsync

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

File:

• trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp

@@ -1071 +1071 @@
  * @param   pCtx                Guest control command context to use.
  * @param   puHandle            Where to return the directory handle to rewind.
- * @param   pcbDirEntry         Where to return the directory entry size.
- */
-VBGLR3DECL(int) VbglR3GuestCtrlDirGetRead(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t *puHandle, uint32_t *pcbDirEntry)
-{
-    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
-    AssertReturn(pCtx->uNumParms == 5, VERR_INVALID_PARAMETER);
+ */
+VBGLR3DECL(int) VbglR3GuestCtrlDirGetRead(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t *puHandle)
+{
+    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
+    AssertReturn(pCtx->uNumParms == 2, VERR_INVALID_PARAMETER);
 
     AssertPtrReturn(puHandle, VERR_INVALID_POINTER);
-    AssertPtrReturn(pcbDirEntry, VERR_INVALID_POINTER);
 
     int rc;
@@ -1088 +1086 @@
         VbglHGCMParmUInt32Set(&Msg.context, HOST_MSG_DIR_READ);
         VbglHGCMParmUInt32Set(&Msg.handle, 0);
-        VbglHGCMParmUInt32Set(&Msg.max_entry_size, 0);
 
         rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
@@ -1095 +1092 @@
             Msg.context.GetUInt32(&pCtx->uContextID);
             Msg.handle.GetUInt32(puHandle);
-            Msg.max_entry_size.GetUInt32(pcbDirEntry);
         }
     } while (rc == VERR_INTERRUPTED && g_fVbglR3GuestCtrlHavePeekGetCancel);
@@ -2274 +2270 @@
  * @param   uRc                 Guest rc of operation (note: IPRT-style signed int).
  * @param   pEntry              Directory entry to send.
- * @param   cbSize              Size (in bytes) of \a pDirEntry to send.
- *                              This might be needed as the size can be bigger than GSTCTLDIRENTRYEX.
+ * @param   cbSize              Size (in bytes) of the OFFSET(GSTCTLDIRENTRYEX, szName[pEntry->cbName + 1]).
  *                              See RTDirReadEx() for more information.
  * @param   pszUser             Associated user ID (owner, uid) as a string.
@@ -2309 +2304 @@
  * @param   uRc                 Guest rc of operation (note: IPRT-style signed int).
  * @param   pEntry              Directory entry to send.
- * @param   cbSize              Size (in bytes) of \a pDirEntry to send.
- *                              This might be needed as the size can be bigger than GSTCTLDIRENTRYEX.
+ * @param   cbSize              Size (in bytes) of the OFFSET(GSTCTLDIRENTRYEX, szName[pEntry->cbName + 1]).
  *                              See RTDirReadEx() for more information.
  */