Changeset 54008 in vbox for trunk/src/VBox

Timestamp:

Jan 28, 2015 11:23:10 AM (10 years ago)

Author:

vboxsync

Message:

Additions/x11/VBoxClient: initialise the guest library from the services, as preparation for running the display service without using the VMM device.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• clipboard.cpp (modified) (3 diffs)
• display.cpp (modified) (2 diffs)
• draganddrop.cpp (modified) (4 diffs)
• hostversion.cpp (modified) (2 diffs)
• main.cpp (modified) (2 diffs)
• seamless.cpp (modified) (2 diffs)
• testcase/tstSeamlessX11.cpp (modified) (1 diff)

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

@@ -285 +285 @@
 static int run(struct VBCLSERVICE **ppInterface, bool fDaemonised)
 {
-    int rc = vboxClipboardConnect();
+    int rc;
 
     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));
+    rc = vboxClipboardConnect();
     if (RT_SUCCESS(rc))
         rc = vboxClipboardMain();
@@ -297 +302 @@
 }
 
+static void cleanup(struct VBCLSERVICE **ppInterface)
+{
+    NOREF(ppInterface);
+    VbglR3Term();
+}
+
 struct VBCLSERVICE vbclClipboardInterface =
 {
@@ -304 +315 @@
     VBClServiceDefaultHandler, /* pause */
     VBClServiceDefaultHandler, /* resume */
-    VBClServiceDefaultCleanup
+    cleanup
 };
 

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

@@ -123 +123 @@
     int status;
 
+    /* Initialise the guest library. */
+    int rc = VbglR3InitUser();
+    if (RT_FAILURE(rc))
+        VBClFatalError(("Failed to connect to the VirtualBox kernel service, rc=%Rrc\n", rc));
     pState->pDisplay = XOpenDisplay(NULL);
     if (!pState->pDisplay)
@@ -395 +399 @@
     NOREF(ppInterface);
     disableEventsAndCaps();
+    VbglR3Term();
 }
 

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

@@ -2200 +2200 @@
 int DragAndDropService::x11DragAndDropInit(void)
 {
+    /* Initialise the guest library. */
+    int rc = VbglR3InitUser();
+    if (RT_FAILURE(rc))
+        VBClFatalError(("Failed to connect to the VirtualBox kernel service, rc=%Rrc\n", rc));
     /* Connect to the x11 server. */
     m_pDisplay = XOpenDisplay(NULL);
@@ -2210 +2214 @@
         return VERR_NO_MEMORY;
 
-    int rc = VINF_SUCCESS;
     do
     {
@@ -2409 +2412 @@
 }
 
+static void cleanup(struct VBCLSERVICE **ppInterface)
+{
+    NOREF(ppInterface);
+    VbglR3Term();
+}
+
 struct VBCLSERVICE vbclDragAndDropInterface =
 {
@@ -2416 +2425 @@
     VBClServiceDefaultHandler, /* pause */
     VBClServiceDefaultHandler, /* resume */
-    VBClServiceDefaultCleanup
+    cleanup
 };
 

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

@@ -131 +131 @@
 
     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). */
@@ -193 +197 @@
     }
 # endif /* VBOX_WITH_GUEST_PROPS */
+    VbglR3Term();
     LogFlowFunc(("returning %Rrc\n", rc));
     return rc;

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

@@ -89 +89 @@
     if (g_szPidFile[0] && g_hPidFile)
         VbglR3ClosePidFile(g_szPidFile, g_hPidFile);
-    VbglR3Term();
     exit(0);
 }
@@ -287 +286 @@
     if (!pcszFileName)
         pcszFileName = "VBoxClient";
-    /* Initialise the guest library. */
-    rc = VbglR3InitUser();
-    if (RT_FAILURE(rc))
-        VBClFatalError(("%s: failed to connect to the VirtualBox kernel service, rc=%Rrc\n",
-                 pcszFileName, rc));
 
     /* Parse our option(s) */

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

@@ -357 +357 @@
     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();
     if (RT_FAILURE(rc))
@@ -404 +408 @@
     NOREF(ppInterface);
     VbglR3SeamlessSetCap(false);
+    VbglR3Term();
 }
 

trunk/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11.cpp

@@ -89 +89 @@
 }
 
+VBGLR3DECL(int)     VbglR3InitUser(void) { return VINF_SUCCESS; }
+VBGLR3DECL(void)    VbglR3Term(void) {}
+
 /**
  * Xlib error handler for certain errors that we can't avoid.