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

Timestamp:

Feb 18, 2008 10:05:36 AM (17 years ago)

Author:

vboxsync

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

28172

Message:

HostServices/SharedClipboard: attempt to handle the guest reconnecting without first disconnecting more gracefully

File:

• trunk/src/VBox/HostServices/SharedClipboard/service.cpp (modified) (2 diffs)

trunk/src/VBox/HostServices/SharedClipboard/service.cpp

@@ -234 +234 @@
 }
 
+/**
+ * Disconnect the host side of the shared clipboard and send a "host disconnected" message
+ * to the guest side.
+ */
+static DECLCALLBACK(int) svcDisconnect (uint32_t u32ClientID, void *pvClient)
+{
+    VBOXCLIPBOARDCLIENTDATA *pClient = (VBOXCLIPBOARDCLIENTDATA *)pvClient;
+
+    vboxSvcClipboardReportMsg (pClient, VBOX_SHARED_CLIPBOARD_HOST_MSG_QUIT, 0);
+
+    vboxClipboardDisconnect (pClient);
+
+    memset (pClient, 0, sizeof (*pClient));
+
+    g_pClient = NULL;
+
+    return VINF_SUCCESS;
+}
+
 static DECLCALLBACK(int) svcConnect (uint32_t u32ClientID, void *pvClient)
 {
     VBOXCLIPBOARDCLIENTDATA *pClient = (VBOXCLIPBOARDCLIENTDATA *)pvClient;
 
+    int rc = VINF_SUCCESS;
+
+    /* If there is already a client connected then we want to release it first. */
+    if (g_pClient != NULL)
+    {
+        uint32_t u32ClientID = g_pClient->u32ClientID;
+
+        svcDisconnect(u32ClientID, g_pClient);
+        /* And free the resources in the hgcm subsystem. */
+        g_pHelpers->pfnDisconnectClient(g_pHelpers->pvInstance, u32ClientID);
+    }
+
     /* Register the client. */
-    int rc = VINF_SUCCESS;
-
     memset (pClient, 0, sizeof (*pClient));
 
@@ -246 +275 @@
 
     rc = vboxClipboardConnect (pClient);
-    
+
     if (VBOX_SUCCESS (rc))
     {
         g_pClient = pClient;
     }
-    
+
     Log(("vboxClipboardConnect: rc = %Vrc\n", rc));
 
     return rc;
-}
-
-static DECLCALLBACK(int) svcDisconnect (uint32_t u32ClientID, void *pvClient)
-{
-    VBOXCLIPBOARDCLIENTDATA *pClient = (VBOXCLIPBOARDCLIENTDATA *)pvClient;
-
-    vboxSvcClipboardReportMsg (pClient, VBOX_SHARED_CLIPBOARD_HOST_MSG_QUIT, 0);
-
-    vboxClipboardDisconnect (pClient);
-
-    memset (pClient, 0, sizeof (*pClient));
-
-    g_pClient = NULL;
-        
-    return VINF_SUCCESS;
 }