Changeset 97748 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Dec 6, 2022 9:26:48 AM (2 years ago)

Author:

vboxsync

Message:

DnD: Renamed GUEST_DND_FN_GH_EVT_ERROR -> GUEST_DND_FN_EVT_ERROR to make this message more generic and not only bound to guest -> host (G->H) transfers. We also need a way to pass back errors for host -> guest (H->G) transfers.

File:

• trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibDragAndDrop.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibDragAndDrop.cpp

@@ -103 +103 @@
 
     } while (rc == VERR_INTERRUPTED);
+
+    return rc;
+}
+
+
+/**
+ * Sends a DnD error back to the host.
+ *
+ * @returns IPRT status code.
+ * @param   pCtx                DnD context to use.
+ * @param   rcErr               Error (IPRT-style) to send.
+ */
+VBGLR3DECL(int) VbglR3DnDSendError(PVBGLR3GUESTDNDCMDCTX pCtx, int rcErr)
+{
+    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
+
+    HGCMMsgGHError Msg;
+    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_FN_EVT_ERROR, 2);
+    /** @todo Context ID not used yet. */
+    Msg.u.v3.uContext.SetUInt32(0);
+    Msg.u.v3.rc.SetUInt32((uint32_t)rcErr); /* uint32_t vs. int. */
+
+    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;
@@ -1882 +1919 @@
         if (rc != VERR_CANCELLED)
         {
-            int rc2 = VbglR3DnDGHSendError(pCtx, rc);
+            int rc2 = VbglR3DnDSendError(pCtx, rc);
             if (RT_FAILURE(rc2))
                 LogFlowFunc(("Unable to send error (%Rrc) to host, rc=%Rrc\n", rc, rc2));
@@ -1890 +1927 @@
     return rc;
 }
-
-/**
- * Guest -> Host
- * Send an error back to the host.
- *
- * @returns IPRT status code.
- * @param   pCtx                DnD context to use.
- * @param   rcErr               Error (IPRT-style) to send.
- */
-VBGLR3DECL(int) VbglR3DnDGHSendError(PVBGLR3GUESTDNDCMDCTX pCtx, int rcErr)
-{
-    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
-
-    HGCMMsgGHError Msg;
-    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_FN_GH_EVT_ERROR, 2);
-    /** @todo Context ID not used yet. */
-    Msg.u.v3.uContext.SetUInt32(0);
-    Msg.u.v3.rc.SetUInt32((uint32_t)rcErr); /* uint32_t vs. int. */
-
-    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;
-}
 #endif /* VBOX_WITH_DRAG_AND_DROP_GH */