Changeset 97749 in vbox for trunk/src/VBox/Main

Timestamp:

Dec 6, 2022 9:32:49 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 [build fix, forgot files].

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestDnDSourceImpl.cpp (modified) (6 diffs)
• GuestDnDTargetImpl.cpp (modified) (3 diffs)

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

@@ -1139 +1139 @@
     REGISTER_CALLBACK(GUEST_DND_FN_CONNECT);
     REGISTER_CALLBACK(GUEST_DND_FN_DISCONNECT);
-    REGISTER_CALLBACK(GUEST_DND_FN_GH_EVT_ERROR);
+    REGISTER_CALLBACK(GUEST_DND_FN_EVT_ERROR);
     if (m_pState->m_uProtocolVersion >= 3)
         REGISTER_CALLBACK(GUEST_DND_FN_GH_SND_DATA_HDR);
@@ -1174 +1174 @@
     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_EVT_ERROR);
     if (m_pState->m_uProtocolVersion >= 3)
         UNREGISTER_CALLBACK(GUEST_DND_FN_GH_SND_DATA_HDR);
@@ -1252 +1252 @@
     REGISTER_CALLBACK(GUEST_DND_FN_CONNECT);
     REGISTER_CALLBACK(GUEST_DND_FN_DISCONNECT);
-    REGISTER_CALLBACK(GUEST_DND_FN_GH_EVT_ERROR);
+    REGISTER_CALLBACK(GUEST_DND_FN_EVT_ERROR);
     if (m_pState->m_uProtocolVersion >= 3)
         REGISTER_CALLBACK(GUEST_DND_FN_GH_SND_DATA_HDR);
@@ -1305 +1305 @@
     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_EVT_ERROR);
     UNREGISTER_CALLBACK(GUEST_DND_FN_GH_SND_DATA_HDR);
     UNREGISTER_CALLBACK(GUEST_DND_FN_GH_SND_DATA);
@@ -1408 +1408 @@
             break;
         }
-        case GUEST_DND_FN_GH_EVT_ERROR:
+        case GUEST_DND_FN_EVT_ERROR:
         {
             PVBOXDNDCBEVTERRORDATA pCBData = reinterpret_cast<PVBOXDNDCBEVTERRORDATA>(pvParms);
@@ -1592 +1592 @@
             break;
         }
-        case GUEST_DND_FN_GH_EVT_ERROR:
+        case GUEST_DND_FN_EVT_ERROR:
         {
             PVBOXDNDCBEVTERRORDATA pCBData = reinterpret_cast<PVBOXDNDCBEVTERRORDATA>(pvParms);

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

@@ -1255 +1255 @@
             break;
         }
-        case GUEST_DND_FN_GH_EVT_ERROR:
+        case GUEST_DND_FN_EVT_ERROR:
         {
             PVBOXDNDCBEVTERRORDATA pCBData = reinterpret_cast<PVBOXDNDCBEVTERRORDATA>(pvParms);
             AssertPtr(pCBData);
             AssertReturn(sizeof(VBOXDNDCBEVTERRORDATA) == cbParms, VERR_INVALID_PARAMETER);
-            AssertReturn(CB_MAGIC_DND_GH_EVT_ERROR == pCBData->hdr.uMagic, VERR_INVALID_PARAMETER);
+            AssertReturn(CB_MAGIC_DND_EVT_ERROR == pCBData->hdr.uMagic, VERR_INVALID_PARAMETER);
 
             pCtx->pState->reset();
@@ -1442 +1442 @@
     REGISTER_CALLBACK(GUEST_DND_FN_DISCONNECT);
     REGISTER_CALLBACK(GUEST_DND_FN_GET_NEXT_HOST_MSG);
-    REGISTER_CALLBACK(GUEST_DND_FN_GH_EVT_ERROR);
+    REGISTER_CALLBACK(GUEST_DND_FN_EVT_ERROR);
     /* Host callbacks. */
     REGISTER_CALLBACK(HOST_DND_FN_HG_SND_DIR);
@@ -1537 +1537 @@
     UNREGISTER_CALLBACK(GUEST_DND_FN_DISCONNECT);
     UNREGISTER_CALLBACK(GUEST_DND_FN_GET_NEXT_HOST_MSG);
-    UNREGISTER_CALLBACK(GUEST_DND_FN_GH_EVT_ERROR);
+    UNREGISTER_CALLBACK(GUEST_DND_FN_EVT_ERROR);
     /* Host callbacks. */
     UNREGISTER_CALLBACK(HOST_DND_FN_HG_SND_DIR);