Changeset 97748 in vbox for trunk/include

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

154809

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.

Location:

trunk/include/VBox

Files:

• HostServices/DragAndDropSvc.h (modified) (4 diffs)
• VBoxGuestLib.h (modified) (2 diffs)

trunk/include/VBox/HostServices/DragAndDropSvc.h

@@ -217 +217 @@
     GUEST_DND_FN_GET_NEXT_HOST_MSG        = 300,
 
+    /** Reports back an error to the host.
+     *
+     *  Note: Don't change the ID to also support older hosts
+     *        (was GUEST_DND_FN_GH_EVT_ERROR before < 7.0, only for G->H transfers).
+     *
+     *        This was changed to GUEST_DND_FN_EVT_ERROR to be a generic event
+     *        that also can be used for H->G transfers.
+     *
+     * @retval  VINF_SUCCESS on success.
+     * @retval  VERR_INVALID_CLIENT_ID
+     * @retval  VERR_WRONG_PARAMETER_COUNT
+     * @retval  VERR_WRONG_PARAMETER_TYPE
+     * @since   7.0.x
+     */
+    GUEST_DND_FN_EVT_ERROR                = 502,
+
     /*
      * Host -> Guest operation messages.
@@ -248 +264 @@
      */
     GUEST_DND_FN_GH_SND_DATA              = 501,
-    /** The guest reports an error back to the host. */
-    GUEST_DND_FN_GH_EVT_ERROR             = 502,
     /** The guest sends a directory entry to the host. */
     GUEST_DND_FN_GH_SND_DIR               = 700,
@@ -936 +950 @@
     CB_MAGIC_DND_CONNECT                   = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_FN_CONNECT, 0),
     CB_MAGIC_DND_REPORT_FEATURES           = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_FN_REPORT_FEATURES, 0),
+    CB_MAGIC_DND_EVT_ERROR                 = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_FN_EVT_ERROR, 0),
     CB_MAGIC_DND_HG_GET_NEXT_HOST_MSG      = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_FN_GET_NEXT_HOST_MSG, 0),
     CB_MAGIC_DND_HG_ACK_OP                 = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_FN_HG_ACK_OP, 0),
@@ -945 +960 @@
     CB_MAGIC_DND_GH_SND_DIR                = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_FN_GH_SND_DIR, 0),
     CB_MAGIC_DND_GH_SND_FILE_HDR           = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_FN_GH_SND_FILE_HDR, 0),
-    CB_MAGIC_DND_GH_SND_FILE_DATA          = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_FN_GH_SND_FILE_DATA, 0),
-    CB_MAGIC_DND_GH_EVT_ERROR              = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_FN_GH_EVT_ERROR, 0)
+    CB_MAGIC_DND_GH_SND_FILE_DATA          = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_FN_GH_SND_FILE_DATA, 0)
 };
 

trunk/include/VBox/VBoxGuestLib.h

@@ -1336 +1336 @@
 
 VBGLR3DECL(int)     VbglR3DnDReportFeatures(uint32_t idClient, uint64_t fGuestFeatures, uint64_t *pfHostFeatures);
+VBGLR3DECL(int)     VbglR3DnDSendError(PVBGLR3GUESTDNDCMDCTX pCtx, int rcOp);
 
 VBGLR3DECL(int)     VbglR3DnDEventGetNext(PVBGLR3GUESTDNDCMDCTX pCtx, PVBGLR3DNDEVENT *ppEvent);
@@ -1346 +1347 @@
 VBGLR3DECL(int)     VbglR3DnDGHSendAckPending(PVBGLR3GUESTDNDCMDCTX pCtx, VBOXDNDACTION dndActionDefault, VBOXDNDACTIONLIST dndLstActionsAllowed, const char* pcszFormats, uint32_t cbFormats);
 VBGLR3DECL(int)     VbglR3DnDGHSendData(PVBGLR3GUESTDNDCMDCTX pCtx, const char *pszFormat, void *pvData, uint32_t cbData);
-VBGLR3DECL(int)     VbglR3DnDGHSendError(PVBGLR3GUESTDNDCMDCTX pCtx, int rcOp);
 #  endif /* VBOX_WITH_DRAG_AND_DROP_GH */
 /** @} */