Changeset 81028 in vbox for trunk/src/VBox/Additions/x11/VBoxClient

Timestamp:

Sep 26, 2019 4:57:53 PM (5 years ago)

Author:

vboxsync

Message:

Additions/VBoxClient: Removed ugly hack requiring --init-vbgl-[user|full] command line arguments to make the optional release logger work.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• clipboard.cpp (modified) (1 diff)
• display-svga-x11.cpp (modified) (1 diff)
• display-svga.cpp (modified) (1 diff)
• draganddrop.cpp (modified) (2 diffs)
• hostversion.cpp (modified) (2 diffs)
• main.cpp (modified) (3 diffs)
• seamless.cpp (modified) (1 diff)

trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp

@@ -291 +291 @@
 
     /* Initialise the guest library. */
-    int rc = VbglR3InitUser();
-    if (RT_FAILURE(rc))
-        VBClFatalError(("Failed to connect to the VirtualBox kernel service, rc=%Rrc\n", rc));
-    rc = SharedClipboardSvcImplConnect();
+    int rc = SharedClipboardSvcImplConnect();
     /* Not RT_SUCCESS: VINF_PERMISSION_DENIED is host service not present. */
     if (rc == VINF_SUCCESS)

trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp

@@ -245 +245 @@
     if (x11Context.pDisplay == NULL)
         return VINF_SUCCESS;
-    /* Initialise the guest library. */
-    rc = VbglR3InitUser();
-    if (RT_FAILURE(rc))
-        VBClFatalError(("Failed to connect to the VirtualBox kernel service, rc=%Rrc\n", rc));
     rc = VbglR3CtlFilterMask(VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST, 0);
     if (RT_FAILURE(rc))

trunk/src/VBox/Additions/x11/VBoxClient/display-svga.cpp

@@ -188 +188 @@
     if (drmContext.hDevice == NIL_RTFILE)
         return VINF_SUCCESS;
-    /* Initialise the guest library. */
-    rc = VbglR3InitUser();
-    if (RT_FAILURE(rc))
-        VBClFatalError(("Failed to connect to the VirtualBox kernel service, rc=%Rrc\n", rc));
     rc = VbglR3CtlFilterMask(VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST, 0);
     if (RT_FAILURE(rc))

trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp

@@ -3044 +3044 @@
     LogFlowFuncEnter();
 
-    /* Initialise the guest library. */
-    int rc = VbglR3InitUser();
-    if (RT_FAILURE(rc))
-    {
-        VBClFatalError(("DnD: Failed to connect to the VirtualBox kernel service, rc=%Rrc\n", rc));
-        return rc;
-    }
-
     /* Connect to the x11 server. */
     m_pDisplay = XOpenDisplay(NULL);
@@ -3063 +3055 @@
     if (!pHelpers)
         return VERR_NO_MEMORY;
+
+    int rc;
 
     do

trunk/src/VBox/Additions/x11/VBoxClient/hostversion.cpp

@@ -130 +130 @@
 
     NOREF(ppInterface);
-    /* Initialise the guest library. */
-    rc = VbglR3InitUser();
-    if (RT_FAILURE(rc))
-        VBClFatalError(("Failed to connect to the VirtualBox kernel service, rc=%Rrc\n", rc));
+
     /* Because we need desktop notifications to be displayed, wait
      * some time to make the desktop environment load (as a work around). */
@@ -225 +222 @@
     return &pService->pInterface;
 }
-

trunk/src/VBox/Additions/x11/VBoxClient/main.cpp

@@ -250 +250 @@
         return RTMsgInitFailure(rc);
 
+    rc = VbglR3InitUser();
+    if (RT_FAILURE(rc))
+        return RTMsgErrorExitFailure("VbglR3InitUser failed: %Rrc", rc);
+
     /* This should never be called twice in one process - in fact one Display
      * object should probably never be used from multiple threads anyway. */
@@ -273 +277 @@
             /* If the user is running in "no daemon" mode anyway, send critical
              * logging to stdout as well. */
-            /** @todo r=bird: Since the release logger isn't created until the service
-             *        calls VbglR3InitUser or VbglR3Init or RTLogCreate, this whole
-             *        exercise is pointless.  Added --init-vbgl-user and --init-vbgl-full
-             *        for getting some work done. */
             PRTLOGGER pReleaseLog = RTLogRelGetDefaultInstance();
             if (pReleaseLog)
@@ -337 +337 @@
                 break;
             g_pService = VBClDisplaySVGAX11Service();
-        }
-        /* bird: this is just a quick hack to get something out of the LogRel statements in the code. */
-        else if (!strcmp(argv[i], "--init-vbgl-user"))
-        {
-            rc = VbglR3InitUser();
-            if (RT_FAILURE(rc))
-                return RTMsgErrorExitFailure("VbglR3InitUser failed: %Rrc", rc);
-        }
-        else if (!strcmp(argv[i], "--init-vbgl-full"))
-        {
-            rc = VbglR3Init();
-            if (RT_FAILURE(rc))
-                return RTMsgErrorExitFailure("VbglR3Init failed: %Rrc", rc);
         }
         else if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help"))

trunk/src/VBox/Additions/x11/VBoxClient/seamless.cpp

@@ -286 +286 @@
 {
     struct SEAMLESSSERVICE *pSelf = getClassFromInterface(ppInterface);
-    int rc;
 
     if (pSelf->mIsInitialised)
         return VERR_INTERNAL_ERROR;
-    /* Initialise the guest library. */
-    rc = VbglR3InitUser();
-    if (RT_FAILURE(rc))
-        VBClFatalError(("Failed to connect to the VirtualBox kernel service, rc=%Rrc\n", rc));
-    rc = pSelf->mSeamless.init();
+
+    int rc = pSelf->mSeamless.init();
     if (RT_FAILURE(rc))
         return rc;