Changeset 85745 in vbox for trunk/src/VBox/HostServices/DragAndDrop

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox/HostServices/DragAndDrop

Files:

• VBoxDragAndDropSvc.cpp (modified) (27 diffs)
• dndmanager.h (modified) (1 diff)

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);