Changeset 71314 in vbox for trunk/src/VBox/Additions

Timestamp:

Mar 13, 2018 3:51:14 PM (7 years ago)

Author:

vboxsync

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

121258

Message:

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

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp (modified) (3 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2013-2017 Oracle Corporation
+ * Copyright (C) 2013-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -625 +625 @@
 #ifdef DEBUG
     VGSvcVerbose(4, "Renaming '%s' to '%s' returned rc=%Rrc\n", szSource, szDest, rc);
+#endif
+    return rc;
+}
+
+
+static int vgsvcGstCtrlSessionHandlePathUserDocuments(PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx)
+{
+    AssertPtrReturn(pSession, VERR_INVALID_POINTER);
+    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, 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;
+}
+
+
+static int vgsvcGstCtrlSessionHandlePathUserHome(PVBOXSERVICECTRLSESSION pSession, PVBGLR3GUESTCTRLCMDCTX pHostCtx)
+{
+    AssertPtrReturn(pSession, VERR_INVALID_POINTER);
+    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, 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
     return rc;
@@ -1026 +1072 @@
             break;
 
+        case HOST_PATH_USER_DOCUMENTS:
+            if (fImpersonated)
+                rc = vgsvcGstCtrlSessionHandlePathUserDocuments(pSession, pHostCtx);
+            else
+                rc = VERR_NOT_SUPPORTED;
+            break;
+
+        case HOST_PATH_USER_HOME:
+            if (fImpersonated)
+                rc = vgsvcGstCtrlSessionHandlePathUserHome(pSession, pHostCtx);
+            else
+                rc = VERR_NOT_SUPPORTED;
+            break;
+
         default:
             rc = VbglR3GuestCtrlMsgSkip(pHostCtx->uClientID);