Changeset 18708 in vbox for trunk/src/VBox/HostServices

Timestamp:

Apr 3, 2009 5:55:59 PM (16 years ago)

Author:

vboxsync

Message:

GuestHost/SharedClipboard: reorganise constructor and destructor funcions

File:

• trunk/src/VBox/HostServices/SharedClipboard/x11-clipboard.cpp (modified) (4 diffs)

trunk/src/VBox/HostServices/SharedClipboard/x11-clipboard.cpp

@@ -164 +164 @@
     RTSemEventCreate(&g_ctxHost.waitForData);
     RTSemMutexCreate(&g_ctxHost.clipboardMutex);
-    rc = VBoxX11ClipboardInitX11(&g_ctxHost, &pBackend);
-    if (RT_FAILURE(rc))
+    pBackend = VBoxX11ClipboardConstructX11(&g_ctxHost);
+    if (pBackend == NULL)
     {
         RTSemEventDestroy(g_ctxHost.waitForData);
         RTSemMutexDestroy(g_ctxHost.clipboardMutex);
-        LogRel(("Failed to start the host shared clipboard service.\n"));
+        LogRel(("Failed to start the host shared clipboard service, out of memory.\n"));
+        rc = VERR_NO_MEMORY;
     }
     else
@@ -198 +199 @@
      *         even if we are not waiting. */
     RTSemEventSignal(g_ctxHost.waitForData);
-    rc = VBoxX11ClipboardTermX11(g_ctxHost.pBackend);
-    if (RT_SUCCESS(rc))
-    {
-        /* We can safely destroy these as the backend has exited
-         * successfully and no other calls from the host code should be
-         * forthcoming. */
-        /** @todo  can the backend fail to exit successfully?  What then? */
-        RTSemEventDestroy(g_ctxHost.waitForData);
-        RTSemMutexDestroy(g_ctxHost.clipboardMutex);
-    }
+    VBoxX11ClipboardDestructX11(g_ctxHost.pBackend);
+    /* We can safely destroy these as the backend has exited
+     * successfully and no other calls from the host code should be
+     * forthcoming. */
+    RTSemEventDestroy(g_ctxHost.waitForData);
+    RTSemMutexDestroy(g_ctxHost.clipboardMutex);
 }
 
@@ -227 +224 @@
      * client at a time. */
     rc = VBoxX11ClipboardStartX11(g_ctxHost.pBackend,
-                                  X11 /* initial owner */);
+                                  true /* fOwnClipboard */);
     return rc;
 }
@@ -263 +260 @@
     RTSemMutexRequest(g_ctxHost.clipboardMutex, RT_INDEFINITE_WAIT);
     g_ctxHost.pClient = NULL;
-    VBoxX11ClipboardStopX11(g_ctxHost.pBackend);
+    /** @todo handle this slightly more reasonably, or be really sure
+     *        it won't go wrong. */
+    AssertRC(VBoxX11ClipboardStopX11(g_ctxHost.pBackend));
     RTSemMutexRelease(g_ctxHost.clipboardMutex);
 }