Changeset 71364 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Mar 16, 2018 9:58:05 AM (7 years ago)

Author:

vboxsync

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

121315

Message:

GuestControl: Added and implemented IGuestSession::userHome and IGuestSession::userDocuments attributes. Untested.

Location:

trunk/src/VBox/Additions/common

Files:

• VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp (modified) (1 diff)
• VBoxService/VBoxServiceControlSession.cpp (modified) (3 diffs)

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

@@ -365 +365 @@
         Msg.flags.GetUInt32(pfFlags);
     }
+    return rc;
+}
+
+
+VBGLR3DECL(int) VbglR3GuestCtrlPathGetUserDocuments(PVBGLR3GUESTCTRLCMDCTX pCtx)
+{
+    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
+    AssertReturn(pCtx->uNumParms == 1, VERR_INVALID_PARAMETER);
+
+    HGCMMsgPathUserDocuments Msg;
+    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_MSG_WAIT, pCtx->uNumParms);
+    VbglHGCMParmUInt32Set(&Msg.context, 0);
+
+    int rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
+    if (RT_SUCCESS(rc))
+        Msg.context.GetUInt32(&pCtx->uContextID);
+
+    return rc;
+}
+
+
+VBGLR3DECL(int) VbglR3GuestCtrlPathGetUserHome(PVBGLR3GUESTCTRLCMDCTX pCtx)
+{
+    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
+    AssertReturn(pCtx->uNumParms == 1, VERR_INVALID_PARAMETER);
+
+    HGCMMsgPathUserHome Msg;
+    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_MSG_WAIT, pCtx->uNumParms);
+    VbglHGCMParmUInt32Set(&Msg.context, 0);
+
+    int rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
+    if (RT_SUCCESS(rc))
+        Msg.context.GetUInt32(&pCtx->uContextID);
+
     return rc;
 }

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

@@ -630 +630 @@
 
 
+/**
+ * Handles getting the user's documents directory.
+ *
+ * @returns VBox status code.
+ * @param   pSession        Guest session.
+ * @param   pHostCtx        Host context.
+ */
 static int vgsvcGstCtrlSessionHandlePathUserDocuments(PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx)
 {
@@ -635 +642 @@
     AssertPtrReturn(pHostCtx, VERR_INVALID_POINTER);
 
-    char szPath[RTPATH_MAX];
-    int rc = RTPathUserDocuments(szPath, sizeof(szPath));
-
-    /* Report back in any case. */
-    int rc2 = VbglR3GuestCtrlMsgReplyEx(pHostCtx, rc, 0 /* Type */,
-                                        szPath, (uint32_t)strlen(szPath) + 1 /* Include terminating zero */);
-    if (RT_FAILURE(rc2))
-        VGSvcError("Failed to report user documents, rc=%Rrc\n", rc2);
-    if (RT_SUCCESS(rc))
-        rc = rc2;
-
-#ifdef DEBUG
-    VGSvcVerbose(4, "User documents is '%s', rc=%Rrc\n", szPath, rc);
-#endif
-    return rc;
-}
-
-
+    int rc = VbglR3GuestCtrlPathGetUserDocuments(pHostCtx);
+    if (RT_SUCCESS(rc))
+    {
+        char szPath[RTPATH_MAX];
+        rc = RTPathUserDocuments(szPath, sizeof(szPath));
+
+#ifdef DEBUG
+        VGSvcVerbose(2, "User documents is '%s', rc=%Rrc\n", szPath, rc);
+#endif
+        /* Report back in any case. */
+        int rc2 = VbglR3GuestCtrlMsgReplyEx(pHostCtx, rc, 0 /* Type */,
+                                            szPath, (uint32_t)strlen(szPath) + 1 /* Include terminating zero */);
+        if (RT_FAILURE(rc2))
+            VGSvcError("Failed to report user documents, rc=%Rrc\n", rc2);
+        if (RT_SUCCESS(rc))
+            rc = rc2;
+    }
+
+    return rc;
+}
+
+
+/**
+ * Handles getting the user's home directory.
+ *
+ * @returns VBox status code.
+ * @param   pSession        Guest session.
+ * @param   pHostCtx        Host context.
+ */
 static int vgsvcGstCtrlSessionHandlePathUserHome(PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx)
 {
@@ -658 +676 @@
     AssertPtrReturn(pHostCtx, VERR_INVALID_POINTER);
 
-    char szPath[RTPATH_MAX];
-    int rc = RTPathUserHome(szPath, sizeof(szPath));
-
-    /* Report back in any case. */
-    int rc2 = VbglR3GuestCtrlMsgReplyEx(pHostCtx, rc, 0 /* Type */,
-                                        szPath, (uint32_t)strlen(szPath) + 1 /* Include terminating zero */);
-    if (RT_FAILURE(rc2))
-        VGSvcError("Failed to report user home, rc=%Rrc\n", rc2);
-    if (RT_SUCCESS(rc))
-        rc = rc2;
-
-#ifdef DEBUG
-    VGSvcVerbose(4, "User home is '%s', rc=%Rrc\n", szPath, rc);
-#endif
+    int rc = VbglR3GuestCtrlPathGetUserHome(pHostCtx);
+    if (RT_SUCCESS(rc))
+    {
+        char szPath[RTPATH_MAX];
+        rc = RTPathUserHome(szPath, sizeof(szPath));
+
+#ifdef DEBUG
+        VGSvcVerbose(2, "User home is '%s', rc=%Rrc\n", szPath, rc);
+#endif
+        /* Report back in any case. */
+        int rc2 = VbglR3GuestCtrlMsgReplyEx(pHostCtx, rc, 0 /* Type */,
+                                            szPath, (uint32_t)strlen(szPath) + 1 /* Include terminating zero */);
+        if (RT_FAILURE(rc2))
+            VGSvcError("Failed to report user home, rc=%Rrc\n", rc2);
+        if (RT_SUCCESS(rc))
+            rc = rc2;
+    }
+
     return rc;
 }