Changeset 102831 in vbox

Timestamp:

Jan 11, 2024 8:56:53 AM (11 months ago)

Author:

vboxsync

Message:

Guest Control: Added a new guest feature flag to indicate Guest Additions support for retrieving guest mount points. bugref:10415

Location:

trunk

Files:

• include/VBox/HostServices/GuestControlSvc.h (modified) (2 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (2 diffs)
• src/VBox/Main/src-client/GuestSessionImpl.cpp (modified) (2 diffs)

trunk/include/VBox/HostServices/GuestControlSvc.h

@@ -832 +832 @@
 /** Supports specifying the working directory for run / start. */
 #define VBOX_GUESTCTRL_GF_0_PROCESS_CWD             RT_BIT_64(5)
+/** Supports enumerating the guest mount points / drive letters.
+ *  @since 7.1 */
+#define VBOX_GUESTCTRL_GF_0_MOUNT_POINTS_ENUM       RT_BIT_64(6)
 /** Bit that must be set in the 2nd parameter, will be cleared if the host reponds
  * correctly (old hosts might not). */
@@ -1688 +1691 @@
 
 #endif /* !VBOX_INCLUDED_HostServices_GuestControlSvc_h */
-

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

@@ -262 +262 @@
                                       | VBOX_GUESTCTRL_GF_0_TOOLBOX_AS_CMDS
 #endif /* VBOX_WITH_GSTCTL_TOOLBOX_AS_CMDS */
-                                      | VBOX_GUESTCTRL_GF_0_SHUTDOWN;
+                                      | VBOX_GUESTCTRL_GF_0_SHUTDOWN
+                                      | VBOX_GUESTCTRL_GF_0_MOUNT_POINTS_ENUM;
         rc = VbglR3GuestCtrlReportFeatures(g_idControlSvcClient, fGuestFeatures, &g_fControlHostFeatures0);
         if (RT_SUCCESS(rc))
             VGSvcVerbose(3, "Host features: %#RX64\n", g_fControlHostFeatures0);
         else
-            VGSvcVerbose(1, "Warning! Feature reporing failed: %Rrc\n", rc);
+            VGSvcVerbose(1, "Warning! Feature reporting failed: %Rrc\n", rc);
 
         return VINF_SUCCESS;

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp

@@ -2450 +2450 @@
 
     com::SafeArray<BSTR> mountPoints;
-    CHECK_ERROR(pCtx->pGuestSession, COMGETTER(MountPoints)(ComSafeArrayAsOutParam(mountPoints)));
+    CHECK_ERROR_RET(pCtx->pGuestSession, COMGETTER(MountPoints)(ComSafeArrayAsOutParam(mountPoints)), RTEXITCODE_FAILURE);
 
     for (size_t i = 0; i < mountPoints.size(); ++i)
@@ -2458 +2458 @@
         RTPrintf("Found %zu mount points\n", mountPoints.size());
 
-    return FAILED(hrc) ? RTEXITCODE_FAILURE : RTEXITCODE_SUCCESS;
+    return RTEXITCODE_SUCCESS;
 }
 

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

@@ -3156 +3156 @@
  *
  * @returns VBox status code.
+ * @retval  VERR_NOT_SUPPORTED if the installed Guest Additions do not support this feature.
  * @param   vecMountPoints      Where to return the mount points (guest-style paths).
  * @param   pvrcGuest           Guest VBox status code, when returning
@@ -3166 +3167 @@
 {
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    if (!(mParent->i_getGuestControlFeatures0() & VBOX_GUESTCTRL_GF_0_MOUNT_POINTS_ENUM))
+        return VERR_NOT_SUPPORTED;
 
     GuestWaitEvent *pEvent = NULL;