Changeset 85749 in vbox for trunk/src/VBox/HostServices/DragAndDrop

Timestamp:

Aug 13, 2020 11:18:00 AM (4 years ago)

Author:

vboxsync

Message:

DnD/HostService: Guest reboot / shutdown fixes.

File:

• trunk/src/VBox/HostServices/DragAndDrop/VBoxDragAndDropSvc.cpp (modified) (8 diffs)

trunk/src/VBox/HostServices/DragAndDrop/VBoxDragAndDropSvc.cpp

@@ -103 +103 @@
     int  clientConnect(uint32_t idClient, void *pvClient) RT_NOEXCEPT RT_OVERRIDE;
     int  clientDisconnect(uint32_t idClient, void *pvClient) RT_NOEXCEPT RT_OVERRIDE;
-    int  clientQueryFeatures(DragAndDropClient *pClient, VBOXHGCMCALLHANDLE hCall, uint32_t cParms, VBOXHGCMSVCPARM paParms[]) RT_NOEXCEPT;
-    int  clientReportFeatures(DragAndDropClient *pClient, VBOXHGCMCALLHANDLE hCall, uint32_t cParms, VBOXHGCMSVCPARM paParms[]) RT_NOEXCEPT;
+    int  clientQueryFeatures(uint32_t cParms, VBOXHGCMSVCPARM paParms[]) RT_NOEXCEPT;
+    int  clientReportFeatures(DragAndDropClient *pClient, uint32_t cParms, VBOXHGCMSVCPARM paParms[]) RT_NOEXCEPT;
     void guestCall(VBOXHGCMCALLHANDLE callHandle, uint32_t idClient, void *pvClient, uint32_t u32Function,
                    uint32_t cParms, VBOXHGCMSVCPARM paParms[]) RT_NOEXCEPT RT_OVERRIDE;
@@ -307 +307 @@
  *
  * @param   pClient     The client state.
- * @param   hCall       The client's call handle.
  * @param   cParms      Number of parameters.
  * @param   paParms     Array of parameters.
  */
-int DragAndDropService::clientReportFeatures(DragAndDropClient *pClient,
-                                             VBOXHGCMCALLHANDLE hCall, uint32_t cParms, VBOXHGCMSVCPARM paParms[]) RT_NOEXCEPT
-{
+int DragAndDropService::clientReportFeatures(DragAndDropClient *pClient, uint32_t cParms, VBOXHGCMSVCPARM paParms[]) RT_NOEXCEPT
+{
+    RT_NOREF(pClient);
+
     /*
      * Validate the request.
@@ -325 +325 @@
 
     /*
-     * Do the work.
+     * Report back the host features.
      */
     paParms[0].u.uint64 = m_fHostFeatures0;
     paParms[1].u.uint64 = 0;
 
-    int rc = pClient->Complete(hCall, VINF_SUCCESS);
-    if (RT_SUCCESS(rc))
-    {
-        pClient->fGuestFeatures0 = fFeatures0;
-        pClient->fGuestFeatures1 = fFeatures1;
-        Log(("[Client %RU32] features: %#RX64 %#RX64\n", pClient->GetClientID(), fFeatures0, fFeatures1));
-    }
-    else
-        LogFunc(("pfnCallComplete -> %Rrc\n", rc));
-
-    return VINF_HGCM_ASYNC_EXECUTE;
+    pClient->fGuestFeatures0 = fFeatures0;
+    pClient->fGuestFeatures1 = fFeatures1;
+
+    Log(("[Client %RU32] features: %#RX64 %#RX64\n", pClient->GetClientID(), fFeatures0, fFeatures1));
+
+    return VINF_SUCCESS;
 }
 
@@ -350 +345 @@
  * @retval  VERR_WRONG_PARAMETER_COUNT
  *
- * @param   pClient     The client state.
- * @param   hCall       The client's call handle.
  * @param   cParms      Number of parameters.
  * @param   paParms     Array of parameters.
  */
-int DragAndDropService::clientQueryFeatures(DragAndDropClient *pClient,
-                                            VBOXHGCMCALLHANDLE hCall, uint32_t cParms, VBOXHGCMSVCPARM paParms[]) RT_NOEXCEPT
+int DragAndDropService::clientQueryFeatures(uint32_t cParms, VBOXHGCMSVCPARM paParms[]) RT_NOEXCEPT
 {
     /*
@@ -367 +359 @@
 
     /*
-     * Do the work.
+     * Report back the host features.
      */
     paParms[0].u.uint64 = m_fHostFeatures0;
     paParms[1].u.uint64 = 0;
 
-    int rc = pClient->Complete(hCall, VINF_SUCCESS);
-    if (RT_FAILURE(rc))
-        LogFunc(("pfnCallComplete -> %Rrc\n", rc));
-
-    return VINF_HGCM_ASYNC_EXECUTE;
+    return VINF_SUCCESS;
 }
 
@@ -638 +626 @@
             {
                 LogFlowFunc(("GUEST_DND_FN_REPORT_FEATURES\n"));
-                rc = clientReportFeatures(pClient, callHandle, cParms, paParms);
+                rc = clientReportFeatures(pClient, cParms, paParms);
                 if (RT_SUCCESS(rc))
                 {
@@ -657 +645 @@
             {
                 LogFlowFunc(("GUEST_DND_FN_QUERY_FEATURES"));
-                rc = clientQueryFeatures(pClient, callHandle, cParms, paParms);
+                rc = clientQueryFeatures(cParms, paParms);
                 break;
             }
@@ -1053 +1041 @@
     }
     else if (pClient)
+    {
+        /* Complete the call on the guest side. */
         pClient->Complete(callHandle, rc);
+    }
     else
     {