Changeset 68528 in vbox for trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp

Timestamp:

Aug 24, 2017 7:32:44 PM (7 years ago)

Author:

vboxsync

Message:

VbglR3DnDGHSendError: Don't use VbglR3HGCMCallRaw, instead ignore specific status code that the host is expected to return if there are no appropriate callbacks. (bad design?)

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDragAndDrop.cpp

@@ -1974 +1974 @@
     }
 
-    int rc = VbglR3HGCMCallRaw(&Msg.hdr, sizeof(Msg));
-    if (RT_SUCCESS(rc))
-    {
-        if (RT_FAILURE(Msg.hdr.result))
-        {
-            LogFlowFunc(("Sending error %Rrc failed with rc=%Rrc\n", rcErr, Msg.hdr.result));
-
-            /* Never return an error if the host did not accept the error at
-             * the current time. This can be due to the host not having any appropriate
-             * callbacks set which would handle that error. */
-            rc = VINF_SUCCESS;
-        }
-    }
+    int rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
+
+    /*
+     * Never return an error if the host did not accept the error at the current
+     * time.  This can be due to the host not having any appropriate callbacks
+     * set which would handle that error.
+     *
+     * bird: Looks like VERR_NOT_SUPPORTED is what the host will return if it
+     *       doesn't an appropriate callback.  The code used to ignore ALL errors
+     *       the host would return, also relevant ones.
+     */
+    if (RT_FAILURE(rc))
+        LogFlowFunc(("Sending error %Rrc failed with rc=%Rrc\n", rcErr, rc));
+    if (rc == VERR_NOT_SUPPORTED)
+        rc = VINF_SUCCESS;
 
     return rc;