Changeset 73941 in vbox for trunk

Timestamp:

Aug 29, 2018 8:56:02 AM (6 years ago)

Author:

vboxsync

Message:

DnD/Main: Fixed including the context ID when using protocol v3 with HOST_DND_HG_EVT_LEAVE and HOST_DND_HG_EVT_CANCEL.

File:

• trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp (modified) (2 diffs)

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

@@ -432 +432 @@
 
     HRESULT hr = S_OK;
-    int rc = GuestDnDInst()->hostCall(HOST_DND_HG_EVT_LEAVE,
-                                      0 /* cParms */, NULL /* paParms */);
+
+    GuestDnDMsg Msg;
+    Msg.setType(HOST_DND_HG_EVT_LEAVE);
+    if (mDataBase.m_uProtocolVersion >= 3)
+        Msg.setNextUInt32(0); /** @todo ContextID not used yet. */
+
+    int rc = GuestDnDInst()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
     if (RT_SUCCESS(rc))
     {
@@ -693 +698 @@
 
     LogFlowFunc(("Cancelling operation, telling guest ...\n"));
-    return GuestDnDInst()->hostCall(HOST_DND_HG_EVT_CANCEL, 0 /* cParms */, NULL /*paParms*/);
+
+    GuestDnDMsg Msg;
+    Msg.setType(HOST_DND_HG_EVT_CANCEL);
+    if (mDataBase.m_uProtocolVersion >= 3)
+        Msg.setNextUInt32(0); /** @todo ContextID not used yet. */
+
+    return GuestDnDInst()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
 }