Index: trunk/include/VBox/HostServices/DragAndDropSvc.h
===================================================================
--- trunk/include/VBox/HostServices/DragAndDropSvc.h	(revision 85722)
+++ trunk/include/VBox/HostServices/DragAndDropSvc.h	(revision 85745)
@@ -49,18 +49,18 @@
  *         + Added VBOXDNDSNDDATAHDR and VBOXDNDCBSNDDATAHDRDATA to support (simple) accounting of objects
  *           being transferred, along with supplying separate meta data size (which is part of the total size being sent).
- *         + Added new HOST_DND_HG_SND_DATA_HDR + GUEST_DND_GH_SND_DATA_HDR commands which now allow specifying an optional
+ *         + Added new HOST_DND_FN_HG_SND_DATA_HDR + GUEST_DND_FN_GH_SND_DATA_HDR commands which now allow specifying an optional
  *           compression type and defining a checksum for the overall data transfer.
  *         + Enhannced VBOXDNDGHSENDDATAMSG to support (rolling) checksums for the supplied data block.
  *         + VBOXDNDHGSENDDATAMSG and VBOXDNDGHSENDDATAMSG can now contain an optional checksum for the current data block.
  *         | VBOXDNDHGSENDFILEDATAMSG and VBOXDNDGHSENDFILEDATAMSG are now sharing the same HGCM mesasge.
- *         - Removed unused HOST_DND_GH_RECV_DIR, HOST_DND_GH_RECV_FILE_DATA and HOST_DND_GH_RECV_FILE_HDR commands.
+ *         - Removed unused HOST_DND_FN_GH_RECV_DIR, HOST_DND_FN_GH_RECV_FILE_DATA and HOST_DND_FN_GH_RECV_FILE_HDR commands.
  *
  *     VBox 6.1.x and up, current:
- *         + Added GUEST_DND_QUERY_FEATURES + GUEST_DND_REPORT_FEATURES.
+ *         + Added GUEST_DND_FN_QUERY_FEATURES + GUEST_DND_FN_REPORT_FEATURES.
  *         - Protocol versioning support in VBOXDNDCONNECTMSG is now marked as being deprecated.
  *
  ** @todo:
  * - Split up messages which use VBOXDNDHGACTIONMSG into own functions and remove parameters which
- *   are not actually needed / used by a function. Why does HOST_DND_HG_EVT_MOVE need all the format stuff, for example?
+ *   are not actually needed / used by a function. Why does HOST_DND_FN_HG_EVT_MOVE need all the format stuff, for example?
  */
 
@@ -91,5 +91,5 @@
 {
     /** The host sets a new DnD mode. */
-    HOST_DND_SET_MODE                  = 100,
+    HOST_DND_FN_SET_MODE                  = 100,
     /** The host requests to cancel the current DnD operation on
      *  the guest side. This can happen on user request on the host's
@@ -99,5 +99,5 @@
      *        not rely on an answer from the guest side in order to
      *        properly cancel the operation. */
-    HOST_DND_CANCEL                    = 204,
+    HOST_DND_FN_CANCEL                    = 204,
 
     /*
@@ -107,37 +107,37 @@
     /** The host enters the VM window for starting an actual
      *  DnD operation. */
-    HOST_DND_HG_EVT_ENTER              = 200,
+    HOST_DND_FN_HG_EVT_ENTER              = 200,
     /** The host's DnD cursor moves within the VM window. */
-    HOST_DND_HG_EVT_MOVE               = 201,
+    HOST_DND_FN_HG_EVT_MOVE               = 201,
     /** The host leaves the guest VM window. */
-    HOST_DND_HG_EVT_LEAVE              = 202,
+    HOST_DND_FN_HG_EVT_LEAVE              = 202,
     /** The host issues a "drop" event, meaning that the host is
      *  ready to transfer data over to the guest. */
-    HOST_DND_HG_EVT_DROPPED            = 203,
+    HOST_DND_FN_HG_EVT_DROPPED            = 203,
     /** The host sends the data header at the beginning of a (new)
      *  data transfer. */
-    HOST_DND_HG_SND_DATA_HDR           = 210,
+    HOST_DND_FN_HG_SND_DATA_HDR           = 210,
     /**
      * The host sends the actual meta data, based on
-     * the format(s) specified by HOST_DND_HG_EVT_ENTER.
+     * the format(s) specified by HOST_DND_FN_HG_EVT_ENTER.
      *
      * Protocol v1/v2: If the guest supplied buffer too small to send
-     *                 the actual data, the host will send a HOST_DND_HG_SND_MORE_DATA
+     *                 the actual data, the host will send a HOST_DND_FN_HG_SND_MORE_DATA
      *                 message as follow-up.
      * Protocol v3+:   The incoming meta data size is specified upfront in the
-     *                 HOST_DND_HG_SND_DATA_HDR message and must be handled accordingly.
+     *                 HOST_DND_FN_HG_SND_DATA_HDR message and must be handled accordingly.
      */
-    HOST_DND_HG_SND_DATA               = 205,
+    HOST_DND_FN_HG_SND_DATA               = 205,
     /** The host sends more data in case the data did not entirely fit in
-     *  the HOST_DND_HG_SND_DATA message. */
+     *  the HOST_DND_FN_HG_SND_DATA message. */
     /** @todo Deprecated function; do not use anymore. */
-    HOST_DND_HG_SND_MORE_DATA          = 206,
+    HOST_DND_FN_HG_SND_MORE_DATA          = 206,
     /** The host sends a directory entry to the guest. */
-    HOST_DND_HG_SND_DIR                = 207,
+    HOST_DND_FN_HG_SND_DIR                = 207,
     /** The host sends a file data chunk to the guest. */
-    HOST_DND_HG_SND_FILE_DATA          = 208,
+    HOST_DND_FN_HG_SND_FILE_DATA          = 208,
     /** The host sends a file header to the guest.
      *  Note: Only for protocol version 2 and up (>= VBox 5.0). */
-    HOST_DND_HG_SND_FILE_HDR           = 209,
+    HOST_DND_FN_HG_SND_FILE_HDR           = 209,
 
     /*
@@ -147,11 +147,11 @@
     /** The host asks the guest whether a DnD operation
      *  is in progress when the mouse leaves the guest window. */
-    HOST_DND_GH_REQ_PENDING            = 600,
+    HOST_DND_FN_GH_REQ_PENDING            = 600,
     /** The host informs the guest that a DnD drop operation
      *  has been started and that the host wants the data in
      *  a specific MIME type. */
-    HOST_DND_GH_EVT_DROPPED            = 601,
+    HOST_DND_FN_GH_EVT_DROPPED            = 601,
     /** Blow the type up to 32-bit. */
-    HOST_DND_32BIT_HACK                = 0x7fffffff
+    HOST_DND_FN_32BIT_HACK                = 0x7fffffff
 };
 
@@ -168,8 +168,8 @@
      * protocol version and flags.
      * Note: New since protocol version 2. */
-    GUEST_DND_CONNECT                  = 10,
+    GUEST_DND_FN_CONNECT                  = 10,
 
     /** The guest client disconnects from the HGCM service. */
-    GUEST_DND_DISCONNECT               = 11,
+    GUEST_DND_FN_DISCONNECT               = 11,
 
     /** Report guest side feature flags and retrieve the host ones.
@@ -185,5 +185,5 @@
      * @since   6.1.x
      */
-    GUEST_DND_REPORT_FEATURES          = 12,
+    GUEST_DND_FN_REPORT_FEATURES          = 12,
 
     /** Query the host ones feature masks.
@@ -199,5 +199,5 @@
      * @since   6.1.x
      */
-    GUEST_DND_QUERY_FEATURES           = 13,
+    GUEST_DND_FN_QUERY_FEATURES           = 13,
 
     /**
@@ -205,5 +205,5 @@
      * on the guest side. This can be a blocking call.
      */
-    GUEST_DND_GET_NEXT_HOST_MSG        = 300,
+    GUEST_DND_FN_GET_NEXT_HOST_MSG        = 300,
 
     /*
@@ -213,9 +213,9 @@
     /** The guest acknowledges that a pending DnD operation from the host
      *  can be dropped on the currently selected area on the guest. */
-    GUEST_DND_HG_ACK_OP                = 400,
+    GUEST_DND_FN_HG_ACK_OP                = 400,
     /** The guest requests the actual DnD data to be sent from the host. */
-    GUEST_DND_HG_REQ_DATA              = 401,
+    GUEST_DND_FN_HG_REQ_DATA              = 401,
     /** The guest reports back its progress back to the host. */
-    GUEST_DND_HG_EVT_PROGRESS          = 402,
+    GUEST_DND_FN_HG_EVT_PROGRESS          = 402,
 
     /*
@@ -228,8 +228,8 @@
      * dragged over to the host.
      */
-    GUEST_DND_GH_ACK_PENDING           = 500,
+    GUEST_DND_FN_GH_ACK_PENDING           = 500,
     /** The guest sends the data header at the beginning of a (new)
      *  data transfer. */
-    GUEST_DND_GH_SND_DATA_HDR          = 503,
+    GUEST_DND_FN_GH_SND_DATA_HDR          = 503,
     /**
      * The guest sends data of the requested format to the host. There can
@@ -237,23 +237,23 @@
      * into one.
      */
-    GUEST_DND_GH_SND_DATA              = 501,
+    GUEST_DND_FN_GH_SND_DATA              = 501,
     /** The guest reports an error back to the host. */
-    GUEST_DND_GH_EVT_ERROR             = 502,
+    GUEST_DND_FN_GH_EVT_ERROR             = 502,
     /** The guest sends a directory entry to the host. */
-    GUEST_DND_GH_SND_DIR               = 700,
+    GUEST_DND_FN_GH_SND_DIR               = 700,
     /** The guest sends file data to the host.
      *  Note: On protocol version 1 this also contains the file name
      *        and other attributes. */
-    GUEST_DND_GH_SND_FILE_DATA         = 701,
+    GUEST_DND_FN_GH_SND_FILE_DATA         = 701,
     /** The guest sends a file header to the host, marking the
      *  beginning of a (new) file transfer.
      *  Note: Available since protocol version 2 (VBox 5.0). */
-    GUEST_DND_GH_SND_FILE_HDR          = 702,
+    GUEST_DND_FN_GH_SND_FILE_HDR          = 702,
     /** Blow the type up to 32-bit. */
-    GUEST_DND_32BIT_HACK               = 0x7fffffff
+    GUEST_DND_FN_32BIT_HACK               = 0x7fffffff
 };
 
 /** @name VBOX_DND_GF_XXX - Guest features.
- * @sa GUEST_DND_REPORT_FEATURES
+ * @sa GUEST_DND_FN_REPORT_FEATURES
  * @{ */
 /** No flags set. */
@@ -297,7 +297,7 @@
  *
  * Used by:
- * HOST_DND_HG_EVT_ENTER
- * HOST_DND_HG_EVT_MOVE
- * HOST_DND_HG_EVT_DROPPED
+ * HOST_DND_FN_HG_EVT_ENTER
+ * HOST_DND_FN_HG_EVT_MOVE
+ * HOST_DND_FN_HG_EVT_DROPPED
  */
 typedef struct HGCMMsgHGAction
@@ -336,5 +336,5 @@
  *
  * Used by:
- * HOST_DND_HG_EVT_LEAVE
+ * HOST_DND_FN_HG_EVT_LEAVE
  */
 typedef struct HGCMMsgHGLeave
@@ -355,5 +355,5 @@
  *
  * Used by:
- * HOST_DND_HG_EVT_CANCEL
+ * HOST_DND_FN_HG_EVT_CANCEL
  */
 typedef struct HGCMMsgHGCancel
@@ -374,6 +374,6 @@
  *
  * Used by:
- * HOST_DND_HG_SND_DATA_HDR
- * GUEST_DND_GH_SND_DATA_HDR
+ * HOST_DND_FN_HG_SND_DATA_HDR
+ * GUEST_DND_FN_GH_SND_DATA_HDR
  *
  * New since protocol v3.
@@ -418,5 +418,5 @@
  *
  * Used by:
- * HOST_DND_HG_SND_DATA
+ * HOST_DND_FN_HG_SND_DATA
  */
 typedef struct HGCMMsgHGSendData
@@ -459,5 +459,5 @@
  *
  * Used by:
- * HOST_DND_HG_SND_MORE_DATA
+ * HOST_DND_FN_HG_SND_MORE_DATA
  */
 typedef struct HGCMMsgHGSendMoreData
@@ -473,6 +473,6 @@
  *
  * Used by:
- * HOST_DND_HG_SND_DIR
- * GUEST_DND_GH_SND_DIR
+ * HOST_DND_FN_HG_SND_DIR
+ * GUEST_DND_FN_GH_SND_DIR
  */
 typedef struct HGCMMsgHGSendDir
@@ -510,6 +510,6 @@
  *
  * Used by:
- * HOST_DND_HG_SND_FILE_HDR
- * GUEST_DND_GH_SND_FILE_HDR
+ * HOST_DND_FN_HG_SND_FILE_HDR
+ * GUEST_DND_FN_GH_SND_FILE_HDR
  */
 typedef struct HGCMMsgHGSendFileHdr
@@ -535,5 +535,5 @@
  *
  * Used by:
- * HOST_DND_HG_SND_FILE
+ * HOST_DND_FN_HG_SND_FILE
  */
 typedef struct HGCMMsgHGSendFileData
@@ -591,5 +591,5 @@
  *
  * Used by:
- * HOST_DND_GH_REQ_PENDING
+ * HOST_DND_FN_GH_REQ_PENDING
  */
 typedef struct HGCMMsgGHReqPending
@@ -619,5 +619,5 @@
  *
  * Used by:
- * HOST_DND_GH_EVT_DROPPED
+ * HOST_DND_FN_GH_EVT_DROPPED
  */
 typedef struct HGCMMsgGHDropped
@@ -660,5 +660,5 @@
  *
  * Used by:
- * GUEST_DND_GET_NEXT_HOST_MSG
+ * GUEST_DND_FN_GET_NEXT_HOST_MSG
  */
 typedef struct HGCMMsgGetNext
@@ -680,5 +680,5 @@
  *
  * Used by:
- * GUEST_DND_CONNECT
+ * GUEST_DND_FN_CONNECT
  */
 typedef struct HGCMMsgConnect
@@ -714,5 +714,5 @@
  *
  * Used by:
- * GUEST_DND_HG_ACK_OP
+ * GUEST_DND_FN_HG_ACK_OP
  */
 typedef struct HGCMMsgHGAck
@@ -739,5 +739,5 @@
  *
  * Used by:
- * GUEST_DND_HG_REQ_DATA
+ * GUEST_DND_FN_HG_REQ_DATA
  */
 typedef struct HGCMMsgHGReqData
@@ -788,5 +788,5 @@
  *
  * Used by:
- * GUEST_DND_GH_ACK_PENDING
+ * GUEST_DND_FN_GH_ACK_PENDING
  */
 typedef struct HGCMMsgGHAckPending
@@ -819,5 +819,5 @@
  *
  * Used by:
- * GUEST_DND_GH_SND_DATA_HDR
+ * GUEST_DND_FN_GH_SND_DATA_HDR
  *
  * New since protocol v3.
@@ -829,5 +829,5 @@
  *
  * Used by:
- * GUEST_DND_GH_SND_DATA
+ * GUEST_DND_FN_GH_SND_DATA
  */
 typedef struct HGCMMsgGHSendData
@@ -865,5 +865,5 @@
  *
  * Used by:
- * GUEST_DND_GH_SND_DIR
+ * GUEST_DND_FN_GH_SND_DIR
  */
 typedef struct HGCMMsgHGSendDir HGCMMsgGHSendDir;
@@ -873,5 +873,5 @@
  *
  * Used by:
- * GUEST_DND_GH_SND_FILE_HDR
+ * GUEST_DND_FN_GH_SND_FILE_HDR
  *
  * New since protocol v2.
@@ -883,5 +883,5 @@
  *
  * Used by:
- * GUEST_DND_GH_SND_FILE_DATA
+ * GUEST_DND_FN_GH_SND_FILE_DATA
  */
 typedef struct HGCMMsgHGSendFileData HGCMMsgGHSendFileData;
@@ -891,5 +891,5 @@
  *
  * Used by:
- * GUEST_DND_GH_EVT_ERROR
+ * GUEST_DND_FN_GH_EVT_ERROR
  */
 typedef struct HGCMMsgGHError
@@ -924,17 +924,17 @@
 enum eDnDCallbackMagics
 {
-    CB_MAGIC_DND_CONNECT                   = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_CONNECT, 0),
-    CB_MAGIC_DND_REPORT_FEATURES           = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_REPORT_FEATURES, 0),
-    CB_MAGIC_DND_HG_GET_NEXT_HOST_MSG      = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_GET_NEXT_HOST_MSG, 0),
-    CB_MAGIC_DND_HG_ACK_OP                 = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_HG_ACK_OP, 0),
-    CB_MAGIC_DND_HG_REQ_DATA               = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_HG_REQ_DATA, 0),
-    CB_MAGIC_DND_HG_EVT_PROGRESS           = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_HG_EVT_PROGRESS, 0),
-    CB_MAGIC_DND_GH_ACK_PENDING            = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_GH_ACK_PENDING, 0),
-    CB_MAGIC_DND_GH_SND_DATA               = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_GH_SND_DATA, 0),
-    CB_MAGIC_DND_GH_SND_DATA_HDR           = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_GH_SND_DATA_HDR, 0),
-    CB_MAGIC_DND_GH_SND_DIR                = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_GH_SND_DIR, 0),
-    CB_MAGIC_DND_GH_SND_FILE_HDR           = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_GH_SND_FILE_HDR, 0),
-    CB_MAGIC_DND_GH_SND_FILE_DATA          = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_GH_SND_FILE_DATA, 0),
-    CB_MAGIC_DND_GH_EVT_ERROR              = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_GH_EVT_ERROR, 0)
+    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_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),
+    CB_MAGIC_DND_HG_REQ_DATA               = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_FN_HG_REQ_DATA, 0),
+    CB_MAGIC_DND_HG_EVT_PROGRESS           = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_FN_HG_EVT_PROGRESS, 0),
+    CB_MAGIC_DND_GH_ACK_PENDING            = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_FN_GH_ACK_PENDING, 0),
+    CB_MAGIC_DND_GH_SND_DATA               = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_FN_GH_SND_DATA, 0),
+    CB_MAGIC_DND_GH_SND_DATA_HDR           = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_FN_GH_SND_DATA_HDR, 0),
+    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)
 };
 
