Changeset 102833 in vbox for trunk

Timestamp:

Jan 11, 2024 9:18:25 AM (13 months ago)

Author:

vboxsync

Message:

Guest Control: Added a flag for the get mount points HGCM API, so that we later can specify which mount points we want to get (or skip). bugref:10415

Location:

trunk

Files:

• include/VBox/HostServices/GuestControlSvc.h (modified) (1 diff)
• include/VBox/VBoxGuestLib.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp (modified) (2 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp (modified) (1 diff)
• src/VBox/Main/src-client/GuestSessionImpl.cpp (modified) (1 diff)

trunk/include/VBox/HostServices/GuestControlSvc.h

@@ -1182 +1182 @@
     HGCMFunctionParameter context;
 } HGCMMsgPathUserHome;
+
+/**
+ * Retrieves mount points / drive letters from the guest.
+ *
+ * @since 7.1
+ */
+typedef struct HGCMMsgMountPoints
+{
+    VBGLIOCHGCMCALL hdr;
+    /** UInt32: Context ID. */
+    HGCMFunctionParameter context;
+    /** UInt32: Flags; currently unused. */
+    HGCMFunctionParameter flags;
+} HGCMMsgMountPoints;
 
 /**

trunk/include/VBox/VBoxGuestLib.h

@@ -1091 +1091 @@
 VBGLR3DECL(int) VbglR3GuestCtrlPathGetUserDocuments(PVBGLR3GUESTCTRLCMDCTX pCtx);
 VBGLR3DECL(int) VbglR3GuestCtrlPathGetUserHome(PVBGLR3GUESTCTRLCMDCTX pCtx);
-VBGLR3DECL(int) VbglR3GuestCtrlGetMountPoints(PVBGLR3GUESTCTRLCMDCTX pCtx);
+VBGLR3DECL(int) VbglR3GuestCtrlGetMountPoints(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t *pfFlags);
 #  ifdef VBOX_WITH_GSTCTL_TOOLBOX_AS_CMDS
 /** @name Guest Control file system functions.

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

@@ -1274 +1274 @@
  *
  * @param   pCtx                Guest control command context to use.
- */
-VBGLR3DECL(int) VbglR3GuestCtrlGetMountPoints(PVBGLR3GUESTCTRLCMDCTX pCtx)
-{
-    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
-    AssertReturn(pCtx->uNumParms == 1, VERR_INVALID_PARAMETER);
-
-    int rc;
-    do
-    {
-        HGCMMsgPathUserHome Msg;
+ * @param   pfFlags             Where to return the get mount point flags on success.
+ */
+VBGLR3DECL(int) VbglR3GuestCtrlGetMountPoints(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t *pfFlags)
+{
+    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
+    AssertReturn(pCtx->uNumParms == 2, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pfFlags, VERR_INVALID_POINTER);
+
+    int rc;
+    do
+    {
+        HGCMMsgMountPoints Msg;
         VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, vbglR3GuestCtrlGetMsgFunctionNo(pCtx->uClientID), pCtx->uNumParms);
         VbglHGCMParmUInt32Set(&Msg.context, HOST_MSG_MOUNT_POINTS);
@@ -1289 +1291 @@
         rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
         if (RT_SUCCESS(rc))
-            Msg.context.GetUInt32(&pCtx->uContextID);
+        {
+            Msg.context.GetUInt32(&pCtx->uContextID);
+            Msg.flags.GetUInt32(pfFlags);
+        }
     } while (rc == VERR_INTERRUPTED && g_fVbglR3GuestCtrlHavePeekGetCancel);
     return rc;

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp

@@ -1766 +1766 @@
      * Retrieve the request.
      */
-    int rc = VbglR3GuestCtrlGetMountPoints(pHostCtx);
-    if (RT_SUCCESS(rc))
-    {
+    uint32_t fFlags;
+    int rc = VbglR3GuestCtrlGetMountPoints(pHostCtx, &fFlags);
+    if (RT_SUCCESS(rc))
+    {
+        /* Note: fFlags is currently unused, so we simply ignore this here. */
+
         VGSVCMOUNTPOINTENUMCTX Ctx;
         Ctx.cb      = 0;

trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp

@@ -3177 +3177 @@
 
     /* Prepare HGCM call. */
-    VBOXHGCMSVCPARM paParms[2];
+    VBOXHGCMSVCPARM paParms[4];
     int i = 0;
     HGCMSvcSetU32(&paParms[i++], pEvent->ContextID());
+    HGCMSvcSetU32(&paParms[i++], 0 /* fFlags, unused */);
 
     alock.release(); /* Drop lock before sending. */