Changeset 49531 in vbox

Timestamp:

Nov 18, 2013 1:09:24 PM (11 years ago)

Author:

vboxsync

Message:

Additions/VBoxService: do try to open the kernel device when executing a user session

File:

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

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

@@ -754 +754 @@
 {
     RTEXITCODE rcExit;
+    bool fUserSession = false;
 
     /*
@@ -778 +779 @@
 #endif
 
+#ifdef VBOX_WITH_GUEST_CONTROL
+    /*
+     * Check if we're the specially spawned VBoxService.exe process that
+     * handles a guest control session.
+     */
+    if (   argc >= 2
+        && !RTStrICmp(argv[1], "guestsession"))
+        fUserSession = true;
+#endif
+
     /*
      * Connect to the kernel part before daemonizing so we can fail and
@@ -784 +795 @@
      * do to some initial stuff with it.
      */
-    VBoxServiceVerbose(2, "Calling VbgR3Init()\n");
-    rc = VbglR3Init();
+    if (fUserSession)
+    {
+        VBoxServiceVerbose(2, "Calling VbgR3InitUser()\n");
+        rc = VbglR3InitUser();
+    }
+    else
+    {
+        VBoxServiceVerbose(2, "Calling VbgR3Init()\n");
+        rc = VbglR3Init();
+    }
     if (RT_FAILURE(rc))
     {
@@ -799 +818 @@
      * handles page fusion.  This saves an extra executable.
      */
-    if (    argc == 2
-        &&  !RTStrICmp(argv[1], "pagefusion"))
+    if (   argc == 2
+        && !RTStrICmp(argv[1], "pagefusion"))
         return VBoxServicePageSharingInitFork();
 #endif
@@ -809 +828 @@
      * handles a guest control session.
      */
-    if (    argc >= 2
-        &&  !RTStrICmp(argv[1], "guestsession"))
+    if (fUserSession)
         return VBoxServiceControlSessionForkInit(argc, argv);
 #endif