Changeset 75747 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Nov 26, 2018 6:54:55 PM (6 years ago)

Author:

vboxsync

Message:

HGCM: Continue with getting VERR_CANCELLED to the service when the guest has cancelled (or canceled if you prefer) the command.

Location:

trunk/src/VBox/Main/src-client

Files:

• HGCM.cpp (modified) (2 diffs)
• HGCMThread.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-client/HGCM.cpp

@@ -139 +139 @@
         ~HGCMService() {};
 
-        static DECLCALLBACK(void) svcHlpCallComplete(VBOXHGCMCALLHANDLE callHandle, int32_t rc);
+        static DECLCALLBACK(int)  svcHlpCallComplete(VBOXHGCMCALLHANDLE callHandle, int32_t rc);
         static DECLCALLBACK(void) svcHlpDisconnectClient(void *pvInstance, uint32_t u32ClientId);
         static DECLCALLBACK(bool) svcHlpIsCallRestored(VBOXHGCMCALLHANDLE callHandle);
@@ -796 +796 @@
  * @interface_method_impl{VBOXHGCMSVCHELPERS,pfnCallComplete}
  */
-/* static */ DECLCALLBACK(void) HGCMService::svcHlpCallComplete(VBOXHGCMCALLHANDLE callHandle, int32_t rc)
+/* static */ DECLCALLBACK(int) HGCMService::svcHlpCallComplete(VBOXHGCMCALLHANDLE callHandle, int32_t rc)
 {
    HGCMMsgCore *pMsgCore = (HGCMMsgCore *)callHandle;
 
-   if (pMsgCore->MsgId () == SVC_MSG_GUESTCALL)
-   {
-       /* Only call the completion for these messages. The helper
-        * is called by the service, and the service does not get
-        * any other messages.
-        */
-       hgcmMsgComplete(pMsgCore, rc);
-   }
-   else
-   {
-       AssertFailed();
-   }
+   /* Only call the completion for these messages. The helper
+    * is called by the service, and the service does not get
+    * any other messages.
+    */
+   AssertMsgReturn(pMsgCore->MsgId() == SVC_MSG_GUESTCALL, ("%d\n", pMsgCore->MsgId()), VERR_WRONG_TYPE);
+   return hgcmMsgComplete(pMsgCore, rc);
 }
 

trunk/src/VBox/Main/src-client/HGCMThread.cpp

@@ -147 +147 @@
         int MsgGet(HGCMMsgCore **ppMsg);
         int MsgPost(HGCMMsgCore *pMsg, PHGCMMSGCALLBACK pfnCallback, bool bWait);
-        void MsgComplete(HGCMMsgCore *pMsg, int32_t result);
+        int MsgComplete(HGCMMsgCore *pMsg, int32_t result);
 };
 
@@ -554 +554 @@
 }
 
-void HGCMThread::MsgComplete(HGCMMsgCore *pMsg, int32_t result)
+int HGCMThread::MsgComplete(HGCMMsgCore *pMsg, int32_t result)
 {
     LogFlow(("HGCMThread::MsgComplete: thread = %p, pMsg = %p\n", this, pMsg));
@@ -561 +561 @@
     AssertReleaseMsg((pMsg->m_fu32Flags & HGCM_MSG_F_IN_PROCESS) != 0, ("%p %x\n", pMsg, pMsg->m_fu32Flags));
 
+    int rcRet = VINF_SUCCESS;
     if (pMsg->m_pfnCallback)
     {
         /** @todo call callback with error code in MsgPost in case of errors */
 
-        pMsg->m_pfnCallback(result, pMsg);
-
-        LogFlow(("HGCMThread::MsgComplete: callback executed. pMsg = %p, thread = %p\n", pMsg, this));
+        rcRet = pMsg->m_pfnCallback(result, pMsg);
+
+        LogFlow(("HGCMThread::MsgComplete: callback executed. pMsg = %p, thread = %p, rcRet = %Rrc\n", pMsg, this, rcRet));
     }
 
@@ -616 +617 @@
         }
     }
+
+    return rcRet;
 }
 
@@ -737 +740 @@
 }
 
-void hgcmMsgComplete(HGCMMsgCore *pMsg, int32_t u32Result)
+int hgcmMsgComplete(HGCMMsgCore *pMsg, int32_t u32Result)
 {
     LogFlow(("MAIN::hgcmMsgComplete: pMsg = %p\n", pMsg));
 
+    int rc;
     if (pMsg)
-        pMsg->Thread()->MsgComplete(pMsg, u32Result);
-
-
-    LogFlow(("MAIN::hgcmMsgComplete: pMsg = %p, rc = void\n", pMsg));
+        rc = pMsg->Thread()->MsgComplete(pMsg, u32Result);
+    else
+        rc = VINF_SUCCESS;
+
+    LogFlow(("MAIN::hgcmMsgComplete: pMsg = %p, rc = %Rrc\n", pMsg, rc));
+    return rc;
 }