Changeset 85745 in vbox for trunk/src/VBox

Timestamp:

Aug 13, 2020 8:37:09 AM (5 years ago)

Author:

vboxsync

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

139893

Message:

DnD: Renaming -- prefix all HGCM function number defines with [GUEST|HOST]_DND_FN_ to better distinguish from other defines.

Location:

trunk/src/VBox

Files:

• Additions/WINNT/VBoxTray/VBoxDnD.cpp (modified) (2 diffs)
• Additions/common/VBoxGuest/lib/VBoxGuestR3LibDragAndDrop.cpp (modified) (48 diffs)
• Additions/x11/VBoxClient/draganddrop.cpp (modified) (2 diffs)
• HostServices/DragAndDrop/VBoxDragAndDropSvc.cpp (modified) (27 diffs)
• HostServices/DragAndDrop/dndmanager.h (modified) (1 diff)
• Main/src-client/ConsoleImpl.cpp (modified) (1 diff)
• Main/src-client/GuestDnDPrivate.cpp (modified) (8 diffs)
• Main/src-client/GuestDnDSourceImpl.cpp (modified) (16 diffs)
• Main/src-client/GuestDnDTargetImpl.cpp (modified) (17 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnD.cpp

@@ -570 +570 @@
                     }
 
-                    /* Note: After HOST_DND_HG_EVT_ENTER there immediately is a move
+                    /* Note: After HOST_DND_FN_HG_EVT_ENTER there immediately is a move
                      *       event, so fall through is intentional here. */
                     RT_FALL_THROUGH();
@@ -1204 +1204 @@
     /**
      * Some notes regarding guest cursor movement:
-     * - The host only sends an HOST_DND_GH_REQ_PENDING message to the guest
+     * - The host only sends an HOST_DND_FN_GH_REQ_PENDING message to the guest
      *   if the mouse cursor is outside the VM's window.
      * - The guest does not know anything about the host's cursor

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

@@ -73 +73 @@
 
     HGCMMsgGetNext Msg;
-    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_GET_NEXT_HOST_MSG, 3);
+    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_FN_GET_NEXT_HOST_MSG, 3);
     Msg.uMsg.SetUInt32(0);
     Msg.cParms.SetUInt32(0);
@@ -172 +172 @@
 /**
  * Host -> Guest
- * Utility function to receive a HOST_DND_HG_EVT_LEAVE message from the host.
+ * Utility function to receive a HOST_DND_FN_HG_EVT_LEAVE message from the host.
  *
  * @returns IPRT status code.
@@ -182 +182 @@
 
     HGCMMsgHGLeave Msg;
-    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_HG_EVT_LEAVE, 1);
+    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_FN_HG_EVT_LEAVE, 1);
     /** @todo Context ID not used yet. */
     Msg.u.v3.uContext.SetUInt32(0);
@@ -191 +191 @@
 /**
  * Host -> Guest
- * Utility function to receive a HOST_DND_HG_EVT_CANCEL message from the host.
+ * Utility function to receive a HOST_DND_FN_HG_EVT_CANCEL message from the host.
  *
  * @returns IPRT status code.
@@ -201 +201 @@
 
     HGCMMsgHGCancel Msg;
-    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_CANCEL, 1);
+    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_FN_CANCEL, 1);
     /** @todo Context ID not used yet. */
     Msg.u.v3.uContext.SetUInt32(0);
@@ -210 +210 @@
 /**
  * Host -> Guest
- * Utility function to receive a HOST_DND_HG_SND_DIR message from the host.
+ * Utility function to receive a HOST_DND_FN_HG_SND_DIR message from the host.
  *
  * @returns IPRT status code.
@@ -232 +232 @@
 
     HGCMMsgHGSendDir Msg;
-    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_HG_SND_DIR, 4);
+    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_FN_HG_SND_DIR, 4);
     /** @todo Context ID not used yet. */
     Msg.u.v3.uContext.SetUInt32(0);
@@ -254 +254 @@
 /**
  * Host -> Guest
- * Utility function to receive a HOST_DND_HG_SND_FILE_DATA message from the host.
+ * Utility function to receive a HOST_DND_FN_HG_SND_FILE_DATA message from the host.
  *
  * @returns IPRT status code.
@@ -273 +273 @@
 
     HGCMMsgHGSendFileData Msg;
-    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_HG_SND_FILE_DATA, 5);
+    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_FN_HG_SND_FILE_DATA, 5);
     Msg.u.v3.uContext.SetUInt32(0);
     Msg.u.v3.pvData.SetPtr(pvData, cbData);
@@ -294 +294 @@
 /**
  * Host -> Guest
- * Utility function to receive the HOST_DND_HG_SND_FILE_HDR message from the host.
+ * Utility function to receive the HOST_DND_FN_HG_SND_FILE_HDR message from the host.
  *
  * @returns IPRT status code.
@@ -319 +319 @@
 
     HGCMMsgHGSendFileHdr Msg;
-    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_HG_SND_FILE_HDR, 6);
+    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_FN_HG_SND_FILE_HDR, 6);
     Msg.uContext.SetUInt32(0); /** @todo Not used yet. */
     Msg.pvName.SetPtr(pszFilename, cbFilename);
@@ -410 +410 @@
             switch (uNextMsg)
             {
-                case HOST_DND_HG_SND_DIR:
+                case HOST_DND_FN_HG_SND_DIR:
                 {
                     rc = vbglR3DnDHGRecvDir(pCtx,
@@ -417 +417 @@
                                             &cbPathName,
                                             &fMode);
-                    LogFlowFunc(("HOST_DND_HG_SND_DIR: "
+                    LogFlowFunc(("HOST_DND_FN_HG_SND_DIR: "
                                  "pszPathName=%s, cbPathName=%RU32, fMode=0x%x, rc=%Rrc\n",
                                  szPathName, cbPathName, fMode, rc));
@@ -445 +445 @@
                     break;
                 }
-                case HOST_DND_HG_SND_FILE_HDR:
+                case HOST_DND_FN_HG_SND_FILE_HDR:
                     RT_FALL_THROUGH();
-                case HOST_DND_HG_SND_FILE_DATA:
+                case HOST_DND_FN_HG_SND_FILE_DATA:
                 {
-                    if (uNextMsg == HOST_DND_HG_SND_FILE_HDR)
+                    if (uNextMsg == HOST_DND_FN_HG_SND_FILE_HDR)
                     {
                         rc = vbglR3DnDHGRecvFileHdr(pCtx,
@@ -457 +457 @@
                                                     &fMode,
                                                     &cbFileSize);
-                        LogFlowFunc(("HOST_DND_HG_SND_FILE_HDR: "
+                        LogFlowFunc(("HOST_DND_FN_HG_SND_FILE_HDR: "
                                      "szPathName=%s, fFlags=0x%x, fMode=0x%x, cbFileSize=%RU64, rc=%Rrc\n",
                                      szPathName, fFlags, fMode, cbFileSize, rc));
@@ -467 +467 @@
                                                      cbChunkMax,
                                                      &cbChunkRead);
-                        LogFlowFunc(("HOST_DND_HG_SND_FILE_DATA: "
+                        LogFlowFunc(("HOST_DND_FN_HG_SND_FILE_DATA: "
                                      "cbChunkRead=%RU32, rc=%Rrc\n", cbChunkRead, rc));
                     }
 
                     if (   RT_SUCCESS(rc)
-                        && uNextMsg == HOST_DND_HG_SND_FILE_HDR)
+                        && uNextMsg == HOST_DND_FN_HG_SND_FILE_HDR)
                     {
                         char *pszPathAbs = RTPathJoinA(pszDropDir, szPathName);
@@ -520 +520 @@
 
                     if (   RT_SUCCESS(rc)
-                        && uNextMsg == HOST_DND_HG_SND_FILE_DATA
+                        && uNextMsg == HOST_DND_FN_HG_SND_FILE_DATA
                         && cbChunkRead)
                     {
@@ -527 +527 @@
                         if (RT_SUCCESS(rc))
                         {
-                            LogFlowFunc(("HOST_DND_HG_SND_FILE_DATA: "
+                            LogFlowFunc(("HOST_DND_FN_HG_SND_FILE_DATA: "
                                          "cbChunkRead=%RU32, cbChunkWritten=%RU32, cbFileWritten=%RU64 cbFileSize=%RU64\n",
                                          cbChunkRead, cbChunkWritten, cbFileWritten + cbChunkWritten, cbFileSize));
@@ -557 +557 @@
                     break;
                 }
-                case HOST_DND_CANCEL:
+                case HOST_DND_FN_CANCEL:
                 {
                     rc = vbglR3DnDHGRecvCancel(pCtx);
@@ -623 +623 @@
 /**
  * Host -> Guest
- * Utility function to receive the HOST_DND_HG_SND_DATA message from the host.
+ * Utility function to receive the HOST_DND_FN_HG_SND_DATA message from the host.
  *
  * @returns IPRT status code.
@@ -644 +644 @@
 
     HGCMMsgHGSendData Msg;
-    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_HG_SND_DATA, 5);
+    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_FN_HG_SND_DATA, 5);
     Msg.u.v3.uContext.SetUInt32(0);
     Msg.u.v3.pvData.SetPtr(pvData, cbData);
@@ -674 +674 @@
 /**
  * Host -> Guest
- * Utility function to receive the HOST_DND_HG_SND_DATA_HDR message from the host.
+ * Utility function to receive the HOST_DND_FN_HG_SND_DATA_HDR message from the host.
  *
  * @returns IPRT status code.
@@ -688 +688 @@
 
     HGCMMsgHGSendDataHdr Msg;
-    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_HG_SND_DATA_HDR, 12);
+    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_FN_HG_SND_DATA_HDR, 12);
     Msg.uContext.SetUInt32(0);
     Msg.uFlags.SetUInt32(0);
@@ -909 +909 @@
 /**
  * Guest -> Host
- * Utility function to receive the HOST_DND_GH_REQ_PENDING message from the host.
+ * Utility function to receive the HOST_DND_FN_GH_REQ_PENDING message from the host.
  *
  * @returns IPRT status code.
@@ -921 +921 @@
 
     HGCMMsgGHReqPending Msg;
-    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_GH_REQ_PENDING, 2);
+    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_FN_GH_REQ_PENDING, 2);
     /** @todo Context ID not used yet. */
     Msg.u.v3.uContext.SetUInt32(0);
@@ -939 +939 @@
 /**
  * Guest -> Host
- * Utility function to receive the HOST_DND_GH_EVT_DROPPED message from the host.
+ * Utility function to receive the HOST_DND_FN_GH_EVT_DROPPED message from the host.
  *
  * @returns IPRT status code.
@@ -962 +962 @@
 
     HGCMMsgGHDropped Msg;
-    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_GH_EVT_DROPPED, 4);
+    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_FN_GH_EVT_DROPPED, 4);
     Msg.u.v3.uContext.SetUInt32(0);
     Msg.u.v3.pvFormat.SetPtr(pszFormatTmp, cbFormatTmp);
@@ -1033 +1033 @@
      */
     HGCMMsgConnect Msg;
-    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_CONNECT, 3);
+    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_FN_CONNECT, 3);
     Msg.u.v3.uContext.SetUInt32(0);                /** @todo Context ID not used yet. */
     Msg.u.v3.uProtocol.SetUInt32(pCtx->uProtocolDeprecated); /* Deprecated since VBox 6.1.x. */
@@ -1103 +1103 @@
             HGCMFunctionParameter   f64Features1;
         } Msg;
-        VBGL_HGCM_HDR_INIT(&Msg.Hdr, idClient, GUEST_DND_REPORT_FEATURES, 2);
+        VBGL_HGCM_HDR_INIT(&Msg.Hdr, idClient, GUEST_DND_FN_REPORT_FEATURES, 2);
         VbglHGCMParmUInt64Set(&Msg.f64Features0, fGuestFeatures);
         VbglHGCMParmUInt64Set(&Msg.f64Features1, VBOX_DND_GF_1_MUST_BE_ONE);
@@ -1170 +1170 @@
         switch(uMsg)
         {
-            case HOST_DND_HG_EVT_ENTER:
+            case HOST_DND_FN_HG_EVT_ENTER:
             {
                 rc = vbglR3DnDHGRecvAction(pCtx,
@@ -1185 +1185 @@
                 break;
             }
-            case HOST_DND_HG_EVT_MOVE:
+            case HOST_DND_FN_HG_EVT_MOVE:
             {
                 rc = vbglR3DnDHGRecvAction(pCtx,
@@ -1200 +1200 @@
                 break;
             }
-            case HOST_DND_HG_EVT_DROPPED:
+            case HOST_DND_FN_HG_EVT_DROPPED:
             {
                 rc = vbglR3DnDHGRecvAction(pCtx,
@@ -1215 +1215 @@
                 break;
             }
-            case HOST_DND_HG_EVT_LEAVE:
+            case HOST_DND_FN_HG_EVT_LEAVE:
             {
                 rc = vbglR3DnDHGRecvLeave(pCtx);
@@ -1222 +1222 @@
                 break;
             }
-            case HOST_DND_HG_SND_DATA_HDR:
+            case HOST_DND_FN_HG_SND_DATA_HDR:
             {
                 rc = vbglR3DnDHGRecvDataMain(pCtx, &pEvent->u.HG_Received.Meta);
@@ -1229 +1229 @@
                 break;
             }
-            case HOST_DND_HG_SND_DIR:
+            case HOST_DND_FN_HG_SND_DIR:
                 RT_FALL_THROUGH();
-            case HOST_DND_HG_SND_FILE_HDR:
+            case HOST_DND_FN_HG_SND_FILE_HDR:
                 RT_FALL_THROUGH();
-            case HOST_DND_HG_SND_FILE_DATA:
+            case HOST_DND_FN_HG_SND_FILE_DATA:
             {
                 /*
@@ -1244 +1244 @@
                 break;
             }
-            case HOST_DND_CANCEL:
+            case HOST_DND_FN_CANCEL:
             {
                 rc = vbglR3DnDHGRecvCancel(pCtx);
@@ -1252 +1252 @@
             }
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
-            case HOST_DND_GH_REQ_PENDING:
+            case HOST_DND_FN_GH_REQ_PENDING:
             {
                 rc = vbglR3DnDGHRecvPending(pCtx, &pEvent->u.GH_IsPending.uScreenID);
@@ -1259 +1259 @@
                 break;
             }
-            case HOST_DND_GH_EVT_DROPPED:
+            case HOST_DND_FN_GH_EVT_DROPPED:
             {
                 rc = vbglR3DnDGHRecvDropped(pCtx,
@@ -1359 +1359 @@
 
     HGCMMsgHGAck Msg;
-    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_HG_ACK_OP, 2);
+    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_FN_HG_ACK_OP, 2);
     /** @todo Context ID not used yet. */
     Msg.u.v3.uContext.SetUInt32(0);
@@ -1385 +1385 @@
 
     HGCMMsgHGReqData Msg;
-    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_HG_REQ_DATA, 3);
+    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_FN_HG_REQ_DATA, 3);
     /** @todo Context ID not used yet. */
     Msg.u.v3.uContext.SetUInt32(0);
@@ -1410 +1410 @@
 
     HGCMMsgHGProgress Msg;
-    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_HG_EVT_PROGRESS, 4);
+    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_FN_HG_EVT_PROGRESS, 4);
     /** @todo Context ID not used yet. */
     Msg.u.v3.uContext.SetUInt32(0);
@@ -1445 +1445 @@
 
     HGCMMsgGHAckPending Msg;
-    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_GH_ACK_PENDING, 5);
+    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_FN_GH_ACK_PENDING, 5);
     /** @todo Context ID not used yet. */
     Msg.u.v3.uContext.SetUInt32(0);
@@ -1475 +1475 @@
 
     HGCMMsgGHSendDataHdr MsgHdr;
-    VBGL_HGCM_HDR_INIT(&MsgHdr.hdr, pCtx->uClientID, GUEST_DND_GH_SND_DATA_HDR, 12);
+    VBGL_HGCM_HDR_INIT(&MsgHdr.hdr, pCtx->uClientID, GUEST_DND_FN_GH_SND_DATA_HDR, 12);
     MsgHdr.uContext.SetUInt32(0);                           /** @todo Not used yet. */
     MsgHdr.uFlags.SetUInt32(0);                             /** @todo Not used yet. */
@@ -1497 +1497 @@
     {
         HGCMMsgGHSendData MsgData;
-        VBGL_HGCM_HDR_INIT(&MsgData.hdr, pCtx->uClientID, GUEST_DND_GH_SND_DATA, 5);
+        VBGL_HGCM_HDR_INIT(&MsgData.hdr, pCtx->uClientID, GUEST_DND_FN_GH_SND_DATA, 5);
         MsgData.u.v3.uContext.SetUInt32(0);      /** @todo Not used yet. */
         MsgData.u.v3.pvChecksum.SetPtr(NULL, 0); /** @todo Not used yet. */
@@ -1554 +1554 @@
 
     HGCMMsgGHSendDir Msg;
-    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_GH_SND_DIR, 4);
+    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_FN_GH_SND_DIR, 4);
     /** @todo Context ID not used yet. */
     Msg.u.v3.uContext.SetUInt32(0);
@@ -1602 +1602 @@
 
     HGCMMsgGHSendFileHdr MsgHdr;
-    VBGL_HGCM_HDR_INIT(&MsgHdr.hdr, pCtx->uClientID, GUEST_DND_GH_SND_FILE_HDR, 6);
+    VBGL_HGCM_HDR_INIT(&MsgHdr.hdr, pCtx->uClientID, GUEST_DND_FN_GH_SND_FILE_HDR, 6);
     MsgHdr.uContext.SetUInt32(0);                                                    /* Context ID; unused at the moment. */
     MsgHdr.pvName.SetPtr((void *)pcszPath, (uint32_t)(cchPath + 1));                 /* Include termination. */
@@ -1620 +1620 @@
          */
         HGCMMsgGHSendFileData Msg;
-        VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_GH_SND_FILE_DATA, 5);
+        VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_FN_GH_SND_FILE_DATA, 5);
         Msg.u.v3.uContext.SetUInt32(0);
         Msg.u.v3.pvChecksum.SetPtr(NULL, 0);
@@ -1865 +1865 @@
 
     HGCMMsgGHError Msg;
-    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_GH_EVT_ERROR, 2);
+    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);

trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp

@@ -3174 +3174 @@
                         }
 
-                        /* Note: After HOST_DND_HG_EVT_ENTER there immediately is a move
+                        /* Note: After HOST_DND_FN_HG_EVT_ENTER there immediately is a move
                          *       event, so fall through is intentional here. */
                         RT_FALL_THROUGH();
@@ -3199 +3199 @@
                     }
 
-                    /* Note: VbglR3DnDRecvNextMsg() will return HOST_DND_HG_SND_DATA_HDR when
+                    /* Note: VbglR3DnDRecvNextMsg() will return HOST_DND_FN_HG_SND_DATA_HDR when
                      *       the host has finished copying over all the data to the guest.
                      *

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

@@ -162 +162 @@
     if (m_SvcCtx.pfnHostCallback)
     {
-        int rc2 = m_SvcCtx.pfnHostCallback(m_SvcCtx.pvHostData, GUEST_DND_DISCONNECT, &data, sizeof(data));
+        int rc2 = m_SvcCtx.pfnHostCallback(m_SvcCtx.pvHostData, GUEST_DND_FN_DISCONNECT, &data, sizeof(data));
         if (RT_FAILURE(rc2))
             LogFlowFunc(("Warning: Unable to notify host about client %RU32 disconnect, rc=%Rrc\n", m_idClient, rc2));
@@ -298 +298 @@
 
 /**
- * Implements GUEST_DND_REPORT_FEATURES.
+ * Implements GUEST_DND_FN_REPORT_FEATURES.
  *
  * @returns VBox status code.
@@ -344 +344 @@
 
 /**
- * Implements GUEST_DND_QUERY_FEATURES.
+ * Implements GUEST_DND_FN_QUERY_FEATURES.
  *
  * @returns VBox status code.
@@ -418 +418 @@
     switch (u32Function)
     {
-        case GUEST_DND_GET_NEXT_HOST_MSG:
+        case GUEST_DND_FN_GET_NEXT_HOST_MSG:
         {
             if (modeGet() != VBOX_DRAG_AND_DROP_MODE_OFF)
@@ -431 +431 @@
 
         /* New since protocol v2. */
-        case GUEST_DND_CONNECT:
+        case GUEST_DND_FN_CONNECT:
             RT_FALL_THROUGH();
         /* New since VBox 6.1.x. */
-        case GUEST_DND_REPORT_FEATURES:
+        case GUEST_DND_FN_REPORT_FEATURES:
             RT_FALL_THROUGH();
         /* New since VBox 6.1.x. */
-        case GUEST_DND_QUERY_FEATURES:
+        case GUEST_DND_FN_QUERY_FEATURES:
         {
             /*
@@ -448 +448 @@
         }
 
-        case GUEST_DND_HG_ACK_OP:
-        case GUEST_DND_HG_REQ_DATA:
-        case GUEST_DND_HG_EVT_PROGRESS:
+        case GUEST_DND_FN_HG_ACK_OP:
+        case GUEST_DND_FN_HG_REQ_DATA:
+        case GUEST_DND_FN_HG_EVT_PROGRESS:
         {
             if (   modeGet() == VBOX_DRAG_AND_DROP_MODE_BIDIRECTIONAL
@@ -460 +460 @@
         }
 
-        case GUEST_DND_GH_ACK_PENDING:
-        case GUEST_DND_GH_SND_DATA_HDR:
-        case GUEST_DND_GH_SND_DATA:
-        case GUEST_DND_GH_SND_DIR:
-        case GUEST_DND_GH_SND_FILE_HDR:
-        case GUEST_DND_GH_SND_FILE_DATA:
-        case GUEST_DND_GH_EVT_ERROR:
+        case GUEST_DND_FN_GH_ACK_PENDING:
+        case GUEST_DND_FN_GH_SND_DATA_HDR:
+        case GUEST_DND_FN_GH_SND_DATA:
+        case GUEST_DND_FN_GH_SND_DIR:
+        case GUEST_DND_FN_GH_SND_FILE_HDR:
+        case GUEST_DND_FN_GH_SND_FILE_DATA:
+        case GUEST_DND_FN_GH_EVT_ERROR:
         {
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
@@ -547 +547 @@
             /*
              * Note: Older VBox versions with enabled DnD guest->host support (< 5.0)
-             *       used the same message ID (300) for GUEST_DND_GET_NEXT_HOST_MSG and
-             *       HOST_DND_GH_REQ_PENDING, which led this service returning
+             *       used the same message ID (300) for GUEST_DND_FN_GET_NEXT_HOST_MSG and
+             *       HOST_DND_FN_GH_REQ_PENDING, which led this service returning
              *       VERR_INVALID_PARAMETER when the guest wanted to actually
-             *       handle HOST_DND_GH_REQ_PENDING.
+             *       handle HOST_DND_FN_GH_REQ_PENDING.
              */
-            case GUEST_DND_GET_NEXT_HOST_MSG:
-            {
-                LogFlowFunc(("GUEST_DND_GET_NEXT_HOST_MSG\n"));
+            case GUEST_DND_FN_GET_NEXT_HOST_MSG:
+            {
+                LogFlowFunc(("GUEST_DND_FN_GET_NEXT_HOST_MSG\n"));
                 if (cParms == 3)
                 {
@@ -599 +599 @@
                 break;
             }
-            case GUEST_DND_CONNECT:
-            {
-                LogFlowFunc(("GUEST_DND_CONNECT\n"));
+            case GUEST_DND_FN_CONNECT:
+            {
+                LogFlowFunc(("GUEST_DND_FN_CONNECT\n"));
 
                 ASSERT_GUEST_BREAK(cParms >= 2);
@@ -635 +635 @@
                 break;
             }
-            case GUEST_DND_REPORT_FEATURES:
-            {
-                LogFlowFunc(("GUEST_DND_REPORT_FEATURES\n"));
+            case GUEST_DND_FN_REPORT_FEATURES:
+            {
+                LogFlowFunc(("GUEST_DND_FN_REPORT_FEATURES\n"));
                 rc = clientReportFeatures(pClient, callHandle, cParms, paParms);
                 if (RT_SUCCESS(rc))
@@ -654 +654 @@
                 break;
             }
-            case GUEST_DND_QUERY_FEATURES:
-            {
-                LogFlowFunc(("GUEST_DND_QUERY_FEATURES"));
+            case GUEST_DND_FN_QUERY_FEATURES:
+            {
+                LogFlowFunc(("GUEST_DND_FN_QUERY_FEATURES"));
                 rc = clientQueryFeatures(pClient, callHandle, cParms, paParms);
                 break;
             }
-            case GUEST_DND_HG_ACK_OP:
-            {
-                LogFlowFunc(("GUEST_DND_HG_ACK_OP\n"));
+            case GUEST_DND_FN_HG_ACK_OP:
+            {
+                LogFlowFunc(("GUEST_DND_FN_HG_ACK_OP\n"));
 
                 ASSERT_GUEST_BREAK(cParms >= 2);
@@ -677 +677 @@
                 break;
             }
-            case GUEST_DND_HG_REQ_DATA:
-            {
-                LogFlowFunc(("GUEST_DND_HG_REQ_DATA\n"));
+            case GUEST_DND_FN_HG_REQ_DATA:
+            {
+                LogFlowFunc(("GUEST_DND_FN_HG_REQ_DATA\n"));
 
                 VBOXDNDCBHGREQDATADATA data;
@@ -711 +711 @@
                 break;
             }
-            case GUEST_DND_HG_EVT_PROGRESS:
-            {
-                LogFlowFunc(("GUEST_DND_HG_EVT_PROGRESS\n"));
+            case GUEST_DND_FN_HG_EVT_PROGRESS:
+            {
+                LogFlowFunc(("GUEST_DND_FN_HG_EVT_PROGRESS\n"));
 
                 ASSERT_GUEST_BREAK(cParms >= 3);
@@ -733 +733 @@
             }
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
-            case GUEST_DND_GH_ACK_PENDING:
-            {
-                LogFlowFunc(("GUEST_DND_GH_ACK_PENDING\n"));
+            case GUEST_DND_FN_GH_ACK_PENDING:
+            {
+                LogFlowFunc(("GUEST_DND_FN_GH_ACK_PENDING\n"));
 
                 VBOXDNDCBGHACKPENDINGDATA data;
@@ -775 +775 @@
             }
             /* New since protocol v3. */
-            case GUEST_DND_GH_SND_DATA_HDR:
-            {
-                LogFlowFunc(("GUEST_DND_GH_SND_DATA_HDR\n"));
+            case GUEST_DND_FN_GH_SND_DATA_HDR:
+            {
+                LogFlowFunc(("GUEST_DND_FN_GH_SND_DATA_HDR\n"));
 
                 ASSERT_GUEST_BREAK(cParms == 12);
@@ -811 +811 @@
                 break;
             }
-            case GUEST_DND_GH_SND_DATA:
-            {
-                LogFlowFunc(("GUEST_DND_GH_SND_DATA\n"));
+            case GUEST_DND_FN_GH_SND_DATA:
+            {
+                LogFlowFunc(("GUEST_DND_FN_GH_SND_DATA\n"));
 
                 switch (pClient->uProtocolVerDeprecated)
@@ -857 +857 @@
                 break;
             }
-            case GUEST_DND_GH_SND_DIR:
-            {
-                LogFlowFunc(("GUEST_DND_GH_SND_DIR\n"));
+            case GUEST_DND_FN_GH_SND_DIR:
+            {
+                LogFlowFunc(("GUEST_DND_FN_GH_SND_DIR\n"));
 
                 ASSERT_GUEST_BREAK(cParms >= 3);
@@ -878 +878 @@
             }
             /* New since protocol v2 (>= VBox 5.0). */
-            case GUEST_DND_GH_SND_FILE_HDR:
-            {
-                LogFlowFunc(("GUEST_DND_GH_SND_FILE_HDR\n"));
+            case GUEST_DND_FN_GH_SND_FILE_HDR:
+            {
+                LogFlowFunc(("GUEST_DND_FN_GH_SND_FILE_HDR\n"));
 
                 ASSERT_GUEST_BREAK(cParms == 6);
@@ -902 +902 @@
                 break;
             }
-            case GUEST_DND_GH_SND_FILE_DATA:
-            {
-                LogFlowFunc(("GUEST_DND_GH_SND_FILE_DATA\n"));
+            case GUEST_DND_FN_GH_SND_FILE_DATA:
+            {
+                LogFlowFunc(("GUEST_DND_FN_GH_SND_FILE_DATA\n"));
 
                 switch (pClient->uProtocolVerDeprecated)
@@ -969 +969 @@
                 break;
             }
-            case GUEST_DND_GH_EVT_ERROR:
-            {
-                LogFlowFunc(("GUEST_DND_GH_EVT_ERROR\n"));
+            case GUEST_DND_FN_GH_EVT_ERROR:
+            {
+                LogFlowFunc(("GUEST_DND_FN_GH_EVT_ERROR\n"));
 
                 ASSERT_GUEST_BREAK(cParms >= 1);
@@ -1074 +1074 @@
     switch (u32Function)
     {
-        case HOST_DND_SET_MODE:
+        case HOST_DND_FN_SET_MODE:
         {
             if (cParms != 1)
@@ -1085 +1085 @@
         }
 
-        case HOST_DND_CANCEL:
+        case HOST_DND_FN_CANCEL:
         {
             LogFlowFunc(("Cancelling all waiting clients ...\n"));
@@ -1112 +1112 @@
                 AssertPtr(pClient);
 
-                int rc2 = pClient->SetDeferredMsgInfo(HOST_DND_CANCEL,
+                int rc2 = pClient->SetDeferredMsgInfo(HOST_DND_FN_CANCEL,
                                                       /* Protocol v3+ also contains the context ID. */
                                                       pClient->uProtocolVerDeprecated >= 3 ? 1 : 0);
@@ -1128 +1128 @@
         }
 
-        case HOST_DND_HG_EVT_ENTER:
+        case HOST_DND_FN_HG_EVT_ENTER:
         {
             /* Reset the message queue as a new DnD operation just began. */
@@ -1205 +1205 @@
             if (RT_SUCCESS(rcNext))
             {
-                if (uMsgClient == GUEST_DND_GET_NEXT_HOST_MSG)
+                if (uMsgClient == GUEST_DND_FN_GET_NEXT_HOST_MSG)
                 {
                     rc = pClient->SetDeferredMsgInfo(uMsgNext, cParmsNext);
@@ -1251 +1251 @@
     if (pSelf->m_SvcCtx.pfnHostCallback)
     {
-        LogFlowFunc(("GUEST_DND_HG_EVT_PROGRESS: uStatus=%RU32, uPercentage=%RU32, rc=%Rrc\n",
+        LogFlowFunc(("GUEST_DND_FN_HG_EVT_PROGRESS: uStatus=%RU32, uPercentage=%RU32, rc=%Rrc\n",
                      uStatus, uPercentage, rc));
 
@@ -1261 +1261 @@
 
         return pSelf->m_SvcCtx.pfnHostCallback(pSelf->m_SvcCtx.pvHostData,
-                                               GUEST_DND_HG_EVT_PROGRESS,
+                                               GUEST_DND_FN_HG_EVT_PROGRESS,
                                                &data, sizeof(data));
     }

trunk/src/VBox/HostServices/DragAndDrop/dndmanager.h

@@ -69 +69 @@
     DnDHGCancelMessage(void)
     {
-        int rc2 = initData(DragAndDropSvc::HOST_DND_CANCEL,
+        int rc2 = initData(DragAndDropSvc::HOST_DND_FN_CANCEL,
                            0 /* cParms */, 0 /* aParms */);
         AssertRC(rc2);

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -9234 +9234 @@
 
     int rc = pVMMDev->hgcmHostCall("VBoxDragAndDropSvc",
-                                   DragAndDropSvc::HOST_DND_SET_MODE, 1 /* cParms */, &parm);
+                                   DragAndDropSvc::HOST_DND_FN_SET_MODE, 1 /* cParms */, &parm);
     if (RT_FAILURE(rc))
         LogRel(("Error changing drag and drop mode: %Rrc\n", rc));

trunk/src/VBox/Main/src-client/GuestDnDPrivate.cpp

@@ -527 +527 @@
     switch (u32Function)
     {
-        case DragAndDropSvc::GUEST_DND_CONNECT:
+        case DragAndDropSvc::GUEST_DND_FN_CONNECT:
         {
             DragAndDropSvc::PVBOXDNDCBCONNECTDATA pCBData = reinterpret_cast<DragAndDropSvc::PVBOXDNDCBCONNECTDATA>(pvParms);
@@ -543 +543 @@
         }
 
-        case DragAndDropSvc::GUEST_DND_REPORT_FEATURES:
+        case DragAndDropSvc::GUEST_DND_FN_REPORT_FEATURES:
         {
             DragAndDropSvc::PVBOXDNDCBREPORTFEATURESDATA pCBData = reinterpret_cast<DragAndDropSvc::PVBOXDNDCBREPORTFEATURESDATA>(pvParms);
@@ -558 +558 @@
         }
 
-        case DragAndDropSvc::GUEST_DND_DISCONNECT:
+        case DragAndDropSvc::GUEST_DND_FN_DISCONNECT:
         {
             LogThisFunc(("Client disconnected\n"));
@@ -565 +565 @@
         }
 
-        case DragAndDropSvc::GUEST_DND_HG_ACK_OP:
+        case DragAndDropSvc::GUEST_DND_FN_HG_ACK_OP:
         {
             DragAndDropSvc::PVBOXDNDCBHGACKOPDATA pCBData = reinterpret_cast<DragAndDropSvc::PVBOXDNDCBHGACKOPDATA>(pvParms);
@@ -577 +577 @@
         }
 
-        case DragAndDropSvc::GUEST_DND_HG_REQ_DATA:
+        case DragAndDropSvc::GUEST_DND_FN_HG_REQ_DATA:
         {
             DragAndDropSvc::PVBOXDNDCBHGREQDATADATA pCBData = reinterpret_cast<DragAndDropSvc::PVBOXDNDCBHGREQDATADATA>(pvParms);
@@ -606 +606 @@
         }
 
-        case DragAndDropSvc::GUEST_DND_HG_EVT_PROGRESS:
+        case DragAndDropSvc::GUEST_DND_FN_HG_EVT_PROGRESS:
         {
             DragAndDropSvc::PVBOXDNDCBHGEVTPROGRESSDATA pCBData =
@@ -620 +620 @@
         }
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
-        case DragAndDropSvc::GUEST_DND_GH_ACK_PENDING:
+        case DragAndDropSvc::GUEST_DND_FN_GH_ACK_PENDING:
         {
             DragAndDropSvc::PVBOXDNDCBGHACKPENDINGDATA pCBData =
@@ -1319 +1319 @@
 {
     GuestDnDMsg Msg;
-    Msg.setType(HOST_DND_CANCEL);
+    Msg.setType(HOST_DND_FN_CANCEL);
     if (m_pState->m_uProtocolVersion >= 3)
         Msg.appendUInt32(0); /** @todo ContextID not used yet. */

trunk/src/VBox/Main/src-client/GuestDnDSourceImpl.cpp

@@ -275 +275 @@
 
     GuestDnDMsg Msg;
-    Msg.setType(HOST_DND_GH_REQ_PENDING);
+    Msg.setType(HOST_DND_FN_GH_REQ_PENDING);
     if (m_pState->m_uProtocolVersion >= 3)
         Msg.appendUInt32(0); /** @todo ContextID not used yet. */
@@ -1127 +1127 @@
      * Register callbacks.
      */
-    REGISTER_CALLBACK(GUEST_DND_CONNECT);
-    REGISTER_CALLBACK(GUEST_DND_DISCONNECT);
-    REGISTER_CALLBACK(GUEST_DND_GH_EVT_ERROR);
+    REGISTER_CALLBACK(GUEST_DND_FN_CONNECT);
+    REGISTER_CALLBACK(GUEST_DND_FN_DISCONNECT);
+    REGISTER_CALLBACK(GUEST_DND_FN_GH_EVT_ERROR);
     if (m_pState->m_uProtocolVersion >= 3)
-        REGISTER_CALLBACK(GUEST_DND_GH_SND_DATA_HDR);
-    REGISTER_CALLBACK(GUEST_DND_GH_SND_DATA);
+        REGISTER_CALLBACK(GUEST_DND_FN_GH_SND_DATA_HDR);
+    REGISTER_CALLBACK(GUEST_DND_FN_GH_SND_DATA);
 
     do
@@ -1140 +1140 @@
          */
         GuestDnDMsg Msg;
-        Msg.setType(HOST_DND_GH_EVT_DROPPED);
+        Msg.setType(HOST_DND_FN_GH_EVT_DROPPED);
         if (m_pState->m_uProtocolVersion >= 3)
             Msg.appendUInt32(0); /** @todo ContextID not used yet. */
@@ -1162 +1162 @@
      * Unregister callbacks.
      */
-    UNREGISTER_CALLBACK(GUEST_DND_CONNECT);
-    UNREGISTER_CALLBACK(GUEST_DND_DISCONNECT);
-    UNREGISTER_CALLBACK(GUEST_DND_GH_EVT_ERROR);
+    UNREGISTER_CALLBACK(GUEST_DND_FN_CONNECT);
+    UNREGISTER_CALLBACK(GUEST_DND_FN_DISCONNECT);
+    UNREGISTER_CALLBACK(GUEST_DND_FN_GH_EVT_ERROR);
     if (m_pState->m_uProtocolVersion >= 3)
-        UNREGISTER_CALLBACK(GUEST_DND_GH_SND_DATA_HDR);
-    UNREGISTER_CALLBACK(GUEST_DND_GH_SND_DATA);
+        UNREGISTER_CALLBACK(GUEST_DND_FN_GH_SND_DATA_HDR);
+    UNREGISTER_CALLBACK(GUEST_DND_FN_GH_SND_DATA);
 
 #undef REGISTER_CALLBACK
@@ -1240 +1240 @@
      */
     /* Guest callbacks. */
-    REGISTER_CALLBACK(GUEST_DND_CONNECT);
-    REGISTER_CALLBACK(GUEST_DND_DISCONNECT);
-    REGISTER_CALLBACK(GUEST_DND_GH_EVT_ERROR);
+    REGISTER_CALLBACK(GUEST_DND_FN_CONNECT);
+    REGISTER_CALLBACK(GUEST_DND_FN_DISCONNECT);
+    REGISTER_CALLBACK(GUEST_DND_FN_GH_EVT_ERROR);
     if (m_pState->m_uProtocolVersion >= 3)
-        REGISTER_CALLBACK(GUEST_DND_GH_SND_DATA_HDR);
-    REGISTER_CALLBACK(GUEST_DND_GH_SND_DATA);
-    REGISTER_CALLBACK(GUEST_DND_GH_SND_DIR);
+        REGISTER_CALLBACK(GUEST_DND_FN_GH_SND_DATA_HDR);
+    REGISTER_CALLBACK(GUEST_DND_FN_GH_SND_DATA);
+    REGISTER_CALLBACK(GUEST_DND_FN_GH_SND_DIR);
     if (m_pState->m_uProtocolVersion >= 2)
-        REGISTER_CALLBACK(GUEST_DND_GH_SND_FILE_HDR);
-    REGISTER_CALLBACK(GUEST_DND_GH_SND_FILE_DATA);
+        REGISTER_CALLBACK(GUEST_DND_FN_GH_SND_FILE_HDR);
+    REGISTER_CALLBACK(GUEST_DND_FN_GH_SND_FILE_DATA);
 
     const PDNDDROPPEDFILES pDF = &pCtx->Transfer.DroppedFiles;
@@ -1267 +1267 @@
          */
         GuestDnDMsg Msg;
-        Msg.setType(HOST_DND_GH_EVT_DROPPED);
+        Msg.setType(HOST_DND_FN_GH_EVT_DROPPED);
         if (m_pState->m_uProtocolVersion >= 3)
             Msg.appendUInt32(0); /** @todo ContextID not used yet. */
@@ -1293 +1293 @@
      * Unregister callbacks.
      */
-    UNREGISTER_CALLBACK(GUEST_DND_CONNECT);
-    UNREGISTER_CALLBACK(GUEST_DND_DISCONNECT);
-    UNREGISTER_CALLBACK(GUEST_DND_GH_EVT_ERROR);
-    UNREGISTER_CALLBACK(GUEST_DND_GH_SND_DATA_HDR);
-    UNREGISTER_CALLBACK(GUEST_DND_GH_SND_DATA);
-    UNREGISTER_CALLBACK(GUEST_DND_GH_SND_DIR);
-    UNREGISTER_CALLBACK(GUEST_DND_GH_SND_FILE_HDR);
-    UNREGISTER_CALLBACK(GUEST_DND_GH_SND_FILE_DATA);
+    UNREGISTER_CALLBACK(GUEST_DND_FN_CONNECT);
+    UNREGISTER_CALLBACK(GUEST_DND_FN_DISCONNECT);
+    UNREGISTER_CALLBACK(GUEST_DND_FN_GH_EVT_ERROR);
+    UNREGISTER_CALLBACK(GUEST_DND_FN_GH_SND_DATA_HDR);
+    UNREGISTER_CALLBACK(GUEST_DND_FN_GH_SND_DATA);
+    UNREGISTER_CALLBACK(GUEST_DND_FN_GH_SND_DIR);
+    UNREGISTER_CALLBACK(GUEST_DND_FN_GH_SND_FILE_HDR);
+    UNREGISTER_CALLBACK(GUEST_DND_FN_GH_SND_FILE_DATA);
 
 #undef REGISTER_CALLBACK
@@ -1369 +1369 @@
     switch (uMsg)
     {
-        case GUEST_DND_CONNECT:
+        case GUEST_DND_FN_CONNECT:
             /* Nothing to do here (yet). */
             break;
 
-        case GUEST_DND_DISCONNECT:
+        case GUEST_DND_FN_DISCONNECT:
             rc = VERR_CANCELLED;
             break;
 
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
-        case GUEST_DND_GH_SND_DATA_HDR:
+        case GUEST_DND_FN_GH_SND_DATA_HDR:
         {
             PVBOXDNDCBSNDDATAHDRDATA pCBData = reinterpret_cast<PVBOXDNDCBSNDDATAHDRDATA>(pvParms);
@@ -1388 +1388 @@
             break;
         }
-        case GUEST_DND_GH_SND_DATA:
+        case GUEST_DND_FN_GH_SND_DATA:
         {
             PVBOXDNDCBSNDDATADATA pCBData = reinterpret_cast<PVBOXDNDCBSNDDATADATA>(pvParms);
@@ -1398 +1398 @@
             break;
         }
-        case GUEST_DND_GH_EVT_ERROR:
+        case GUEST_DND_FN_GH_EVT_ERROR:
         {
             PVBOXDNDCBEVTERRORDATA pCBData = reinterpret_cast<PVBOXDNDCBEVTERRORDATA>(pvParms);
@@ -1507 +1507 @@
     switch (uMsg)
     {
-        case GUEST_DND_CONNECT:
+        case GUEST_DND_FN_CONNECT:
             /* Nothing to do here (yet). */
             break;
 
-        case GUEST_DND_DISCONNECT:
+        case GUEST_DND_FN_DISCONNECT:
             rc = VERR_CANCELLED;
             break;
 
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
-        case GUEST_DND_GH_SND_DATA_HDR:
+        case GUEST_DND_FN_GH_SND_DATA_HDR:
         {
             PVBOXDNDCBSNDDATAHDRDATA pCBData = reinterpret_cast<PVBOXDNDCBSNDDATAHDRDATA>(pvParms);
@@ -1526 +1526 @@
             break;
         }
-        case GUEST_DND_GH_SND_DATA:
+        case GUEST_DND_FN_GH_SND_DATA:
         {
             PVBOXDNDCBSNDDATADATA pCBData = reinterpret_cast<PVBOXDNDCBSNDDATADATA>(pvParms);
@@ -1536 +1536 @@
             break;
         }
-        case GUEST_DND_GH_SND_DIR:
+        case GUEST_DND_FN_GH_SND_DIR:
         {
             PVBOXDNDCBSNDDIRDATA pCBData = reinterpret_cast<PVBOXDNDCBSNDDIRDATA>(pvParms);
@@ -1546 +1546 @@
             break;
         }
-        case GUEST_DND_GH_SND_FILE_HDR:
+        case GUEST_DND_FN_GH_SND_FILE_HDR:
         {
             PVBOXDNDCBSNDFILEHDRDATA pCBData = reinterpret_cast<PVBOXDNDCBSNDFILEHDRDATA>(pvParms);
@@ -1557 +1557 @@
             break;
         }
-        case GUEST_DND_GH_SND_FILE_DATA:
+        case GUEST_DND_FN_GH_SND_FILE_DATA:
         {
             PVBOXDNDCBSNDFILEDATADATA pCBData = reinterpret_cast<PVBOXDNDCBSNDFILEDATADATA>(pvParms);
@@ -1582 +1582 @@
             break;
         }
-        case GUEST_DND_GH_EVT_ERROR:
+        case GUEST_DND_FN_GH_EVT_ERROR:
         {
             PVBOXDNDCBEVTERRORDATA pCBData = reinterpret_cast<PVBOXDNDCBEVTERRORDATA>(pvParms);

trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp

@@ -315 +315 @@
     {
         GuestDnDMsg Msg;
-        Msg.setType(HOST_DND_HG_EVT_ENTER);
+        Msg.setType(HOST_DND_FN_HG_EVT_ENTER);
         if (m_pState->m_uProtocolVersion >= 3)
             Msg.appendUInt32(0); /** @todo ContextID not used yet. */
@@ -392 +392 @@
     {
         GuestDnDMsg Msg;
-        Msg.setType(HOST_DND_HG_EVT_MOVE);
+        Msg.setType(HOST_DND_FN_HG_EVT_MOVE);
         if (m_pState->m_uProtocolVersion >= 3)
             Msg.appendUInt32(0); /** @todo ContextID not used yet. */
@@ -439 +439 @@
 
     GuestDnDMsg Msg;
-    Msg.setType(HOST_DND_HG_EVT_LEAVE);
+    Msg.setType(HOST_DND_FN_HG_EVT_LEAVE);
     if (m_pState->m_uProtocolVersion >= 3)
         Msg.appendUInt32(0); /** @todo ContextID not used yet. */
@@ -515 +515 @@
     {
         GuestDnDMsg Msg;
-        Msg.setType(HOST_DND_HG_EVT_DROPPED);
+        Msg.setType(HOST_DND_FN_HG_EVT_DROPPED);
         if (m_pState->m_uProtocolVersion >= 3)
             Msg.appendUInt32(0); /** @todo ContextID not used yet. */
@@ -851 +851 @@
     {
         GuestDnDMsg Msg;
-        Msg.setType(HOST_DND_HG_SND_DATA);
+        Msg.setType(HOST_DND_FN_HG_SND_DATA);
 
         if (m_pState->m_uProtocolVersion < 3)
@@ -905 +905 @@
 
     GuestDnDMsg Msg;
-    Msg.setType(HOST_DND_HG_SND_DATA_HDR);
+    Msg.setType(HOST_DND_FN_HG_SND_DATA_HDR);
 
     LogRel2(("DnD: Sending meta data header to guest (%RU64 bytes total data, %RU32 bytes meta data, %RU64 objects)\n",
@@ -949 +949 @@
     LogRel2(("DnD: Transferring host directory '%s' to guest\n", DnDTransferObjectGetSourcePath(pObj)));
 
-    pMsg->setType(HOST_DND_HG_SND_DIR);
+    pMsg->setType(HOST_DND_FN_HG_SND_DIR);
     if (m_pState->m_uProtocolVersion >= 3)
         pMsg->appendUInt32(0); /** @todo ContextID not used yet. */
@@ -1010 +1010 @@
                  * The just registered callback will be called by the guest afterwards.
                  */
-                pMsg->setType(HOST_DND_HG_SND_FILE_HDR);
+                pMsg->setType(HOST_DND_FN_HG_SND_FILE_HDR);
                 pMsg->appendUInt32(0); /** @todo ContextID not used yet. */
                 pMsg->appendString(pcszDstPath);                    /* pvName */
@@ -1072 +1072 @@
 
     /* Set the message type. */
-    pMsg->setType(HOST_DND_HG_SND_FILE_DATA);
+    pMsg->setType(HOST_DND_FN_HG_SND_FILE_DATA);
 
     const char *pcszSrcPath = DnDTransferObjectGetSourcePath(pObj);
@@ -1078 +1078 @@
 
     /* Protocol version 1 sends the file path *every* time with a new file chunk.
-     * In protocol version 2 we only do this once with HOST_DND_HG_SND_FILE_HDR. */
+     * In protocol version 2 we only do this once with HOST_DND_FN_HG_SND_FILE_HDR. */
     if (m_pState->m_uProtocolVersion <= 1)
     {
@@ -1168 +1168 @@
     switch (uMsg)
     {
-        case GUEST_DND_CONNECT:
+        case GUEST_DND_FN_CONNECT:
             /* Nothing to do here (yet). */
             break;
 
-        case GUEST_DND_DISCONNECT:
+        case GUEST_DND_FN_DISCONNECT:
             rc = VERR_CANCELLED;
             break;
 
-        case GUEST_DND_GET_NEXT_HOST_MSG:
+        case GUEST_DND_FN_GET_NEXT_HOST_MSG:
         {
             PVBOXDNDCBHGGETNEXTHOSTMSG pCBData = reinterpret_cast<PVBOXDNDCBHGGETNEXTHOSTMSG>(pvParms);
@@ -1197 +1197 @@
                     if (RT_SUCCESS(rc)) /* Return message type & required parameter count to the guest. */
                     {
-                        LogFlowFunc(("GUEST_DND_GET_NEXT_HOST_MSG -> %RU32 (%RU32 params)\n", pMsg->getType(), pMsg->getCount()));
+                        LogFlowFunc(("GUEST_DND_FN_GET_NEXT_HOST_MSG -> %RU32 (%RU32 params)\n", pMsg->getType(), pMsg->getCount()));
                         pCBData->uMsg   = pMsg->getType();
                         pCBData->cParms = pMsg->getCount();
@@ -1216 +1216 @@
             break;
         }
-        case GUEST_DND_GH_EVT_ERROR:
+        case GUEST_DND_FN_GH_EVT_ERROR:
         {
             PVBOXDNDCBEVTERRORDATA pCBData = reinterpret_cast<PVBOXDNDCBEVTERRORDATA>(pvParms);
@@ -1240 +1240 @@
             break;
         }
-        case HOST_DND_HG_SND_DIR:
-        case HOST_DND_HG_SND_FILE_HDR:
-        case HOST_DND_HG_SND_FILE_DATA:
+        case HOST_DND_FN_HG_SND_DIR:
+        case HOST_DND_FN_HG_SND_FILE_HDR:
+        case HOST_DND_FN_HG_SND_FILE_DATA:
         {
             PVBOXDNDCBHGGETNEXTHOSTMSGDATA pCBData
@@ -1400 +1400 @@
      */
     /* Guest callbacks. */
-    REGISTER_CALLBACK(GUEST_DND_CONNECT);
-    REGISTER_CALLBACK(GUEST_DND_DISCONNECT);
-    REGISTER_CALLBACK(GUEST_DND_GET_NEXT_HOST_MSG);
-    REGISTER_CALLBACK(GUEST_DND_GH_EVT_ERROR);
+    REGISTER_CALLBACK(GUEST_DND_FN_CONNECT);
+    REGISTER_CALLBACK(GUEST_DND_FN_DISCONNECT);
+    REGISTER_CALLBACK(GUEST_DND_FN_GET_NEXT_HOST_MSG);
+    REGISTER_CALLBACK(GUEST_DND_FN_GH_EVT_ERROR);
     /* Host callbacks. */
-    REGISTER_CALLBACK(HOST_DND_HG_SND_DIR);
+    REGISTER_CALLBACK(HOST_DND_FN_HG_SND_DIR);
     if (m_pState->m_uProtocolVersion >= 2)
-        REGISTER_CALLBACK(HOST_DND_HG_SND_FILE_HDR);
-    REGISTER_CALLBACK(HOST_DND_HG_SND_FILE_DATA);
+        REGISTER_CALLBACK(HOST_DND_FN_HG_SND_FILE_HDR);
+    REGISTER_CALLBACK(HOST_DND_FN_HG_SND_FILE_DATA);
 
     do
@@ -1495 +1495 @@
      */
     /* Guest callbacks. */
-    UNREGISTER_CALLBACK(GUEST_DND_CONNECT);
-    UNREGISTER_CALLBACK(GUEST_DND_DISCONNECT);
-    UNREGISTER_CALLBACK(GUEST_DND_GET_NEXT_HOST_MSG);
-    UNREGISTER_CALLBACK(GUEST_DND_GH_EVT_ERROR);
+    UNREGISTER_CALLBACK(GUEST_DND_FN_CONNECT);
+    UNREGISTER_CALLBACK(GUEST_DND_FN_DISCONNECT);
+    UNREGISTER_CALLBACK(GUEST_DND_FN_GET_NEXT_HOST_MSG);
+    UNREGISTER_CALLBACK(GUEST_DND_FN_GH_EVT_ERROR);
     /* Host callbacks. */
-    UNREGISTER_CALLBACK(HOST_DND_HG_SND_DIR);
+    UNREGISTER_CALLBACK(HOST_DND_FN_HG_SND_DIR);
     if (m_pState->m_uProtocolVersion >= 2)
-        UNREGISTER_CALLBACK(HOST_DND_HG_SND_FILE_HDR);
-    UNREGISTER_CALLBACK(HOST_DND_HG_SND_FILE_DATA);
+        UNREGISTER_CALLBACK(HOST_DND_FN_HG_SND_FILE_HDR);
+    UNREGISTER_CALLBACK(HOST_DND_FN_HG_SND_FILE_DATA);
 
 #undef REGISTER_CALLBACK
@@ -1606 +1606 @@
 
     /** @todo At the moment we only allow sending up to 64K raw data.
-     *        For protocol v1+v2: Fix this by using HOST_DND_HG_SND_MORE_DATA.
-     *        For protocol v3   : Send another HOST_DND_HG_SND_DATA message. */
+     *        For protocol v1+v2: Fix this by using HOST_DND_FN_HG_SND_MORE_DATA.
+     *        For protocol v3   : Send another HOST_DND_FN_HG_SND_DATA message. */
     if (!pCtx->Meta.cbData)
         return VINF_SUCCESS;