Changeset 6998 in vbox for trunk/src/VBox/Frontends/VBoxBFE

Timestamp:

Feb 18, 2008 4:12:49 PM (17 years ago)

Author:

vboxsync

Message:

Frontends/VBoxBFE: updated HGCM in VBoxBFE after r28172, r28177 and r28183

File:

• trunk/src/VBox/Frontends/VBoxBFE/HGCM.cpp (modified) (8 diffs)

trunk/src/VBox/Frontends/VBoxBFE/HGCM.cpp

@@ -30 +30 @@
 #include <iprt/critsect.h>
 #include <iprt/asm.h>
+#include <iprt/ldr.h>
 #include <iprt/param.h>
 #include <iprt/path.h>
-#include <iprt/ldr.h>
 #include <iprt/string.h>
 #include <iprt/semaphore.h>
@@ -126 +126 @@
 
         static DECLCALLBACK(void) svcHlpCallComplete (VBOXHGCMCALLHANDLE callHandle, int32_t rc);
-
+        static DECLCALLBACK(void) svcHlpDisconnectClient (void *pvInstance, uint32_t u32ClientId);
+        
     public:
 
@@ -147 +148 @@
 
         int CreateAndConnectClient (uint32_t *pu32ClientIdOut, uint32_t u32ClientIdIn);
-        int DisconnectClient (uint32_t u32ClientId);
+        int DisconnectClient (uint32_t u32ClientId, bool fFromService);
 
         int HostCall (uint32_t u32Function, uint32_t cParms, VBOXHGCMSVCPARM *paParms);
@@ -765 +766 @@
 }
 
+/* static */ DECLCALLBACK(void) HGCMService::svcHlpDisconnectClient (void *pvInstance, uint32_t u32ClientId)
+{
+     HGCMService *pService = static_cast <HGCMService *> (pvInstance);
+     
+     if (pService)
+     {
+         pService->DisconnectClient (u32ClientId, true);
+     }
+}
+
 static DECLCALLBACK(void) hgcmMsgCompletionCallback (int32_t result, HGCMMsgCore *pMsgCore)
 {
@@ -812 +823 @@
         {
             /* Initialize service helpers table. */
-            m_svcHelpers.pfnCallComplete = svcHlpCallComplete;
-            m_svcHelpers.pvInstance      = this;
+            m_svcHelpers.pfnCallComplete     = svcHlpCallComplete;
+            m_svcHelpers.pvInstance          = this;
+            m_svcHelpers.pfnDisconnectClient = svcHlpDisconnectClient;
 
             /* Execute the load request on the service thread. */
@@ -1116 +1128 @@
         {
             LogFlowFunc(("handle %d\n", pSvc->m_paClientIds[0]));
-            pSvc->DisconnectClient (pSvc->m_paClientIds[0]);
+            pSvc->DisconnectClient (pSvc->m_paClientIds[0], false);
         }
 
@@ -1375 +1387 @@
  * @return VBox rc.
  */
-int HGCMService::DisconnectClient (uint32_t u32ClientId)
-{
-    LogFlowFunc(("client id = %d\n", u32ClientId));
-
-    /* Call the service. */
-    HGCMMSGHANDLE hMsg;
-
-    int rc = hgcmMsgAlloc (m_thread, &hMsg, SVC_MSG_DISCONNECT, hgcmMessageAllocSvc);
-
-    if (VBOX_SUCCESS(rc))
-    {
-        HGCMMsgSvcDisconnect *pMsg = (HGCMMsgSvcDisconnect *)hgcmObjReference (hMsg, HGCMOBJ_MSG);
-        AssertRelease(pMsg);
-
-        pMsg->u32ClientId = u32ClientId;
-
-        hgcmObjDereference (pMsg);
-
-        rc = hgcmMsgSend (hMsg);
-
+int HGCMService::DisconnectClient (uint32_t u32ClientId, bool fFromService)
+{
+    int rc = VINF_SUCCESS;
+
+    LogFlowFunc(("client id = %d, fFromService = %d\n", u32ClientId, fFromService));
+
+    if (!fFromService)
+    {
+        /* Call the service. */
+        HGCMMSGHANDLE hMsg;
+
+        rc = hgcmMsgAlloc (m_thread, &hMsg, SVC_MSG_DISCONNECT, hgcmMessageAllocSvc);
+
+        if (VBOX_SUCCESS(rc))
+        {
+            HGCMMsgSvcDisconnect *pMsg = (HGCMMsgSvcDisconnect *)hgcmObjReference (hMsg, HGCMOBJ_MSG);
+            AssertRelease(pMsg);
+
+            pMsg->u32ClientId = u32ClientId;
+
+            hgcmObjDereference (pMsg);
+
+            rc = hgcmMsgSend (hMsg);
+        }
+    }
+
+    if (VBOX_SUCCESS (rc))
+    {
         /* Remove the client id from the array in any case. */
         int i;
@@ -1730 +1750 @@
 
                 /* Call the service instance to disconnect the client. */
-                rc = pService->DisconnectClient (pMsg->u32ClientId);
+                rc = pService->DisconnectClient (pMsg->u32ClientId, false);
 
                 hgcmObjDereference (pClient);