Changeset 76891 in vbox for trunk/src/VBox/Additions

Timestamp:

Jan 18, 2019 1:17:20 PM (6 years ago)

Author:

vboxsync

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

128259

Message:

DnD: Renamed HOST_DND_HG_EVT_CANCEL -> HOST_DND_HG_CANCEL, fixes for host-side cancellation.

File:

• trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibDragAndDrop.cpp (modified) (4 diffs)

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

@@ -208 +208 @@
     RT_ZERO(Msg);
 
-    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_HG_EVT_CANCEL, 1);
+    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_CANCEL, 1);
     /** @todo Context ID not used yet. */
     Msg.u.v3.uContext.SetUInt32(0);
@@ -534 +534 @@
 
                     if (   RT_SUCCESS(rc)
-                        && uNextMsg == HOST_DND_HG_SND_FILE_DATA)
+                        && uNextMsg == HOST_DND_HG_SND_FILE_DATA
+                        && cbChunkRead)
                     {
                         uint32_t cbChunkWritten;
@@ -570 +571 @@
                     break;
                 }
-                case HOST_DND_HG_EVT_CANCEL:
+                case HOST_DND_CANCEL:
                 {
                     rc = vbglR3DnDHGRecvCancel(pCtx);
@@ -1267 +1268 @@
                 break;
             }
-            case HOST_DND_HG_EVT_CANCEL:
+            case HOST_DND_CANCEL:
             {
                 rc = vbglR3DnDHGRecvCancel(pCtx);