Changeset 76891 in vbox for trunk/src/VBox/Main/src-client

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.

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestDnDPrivate.cpp (modified) (1 diff)
• GuestDnDTargetImpl.cpp (modified) (3 diffs)

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

@@ -922 +922 @@
 int GuestDnDBase::sendCancel(void)
 {
-    int rc = GuestDnDInst()->hostCall(HOST_DND_HG_EVT_CANCEL,
-                                      0 /* cParms */, NULL /* paParms */);
-
-    LogFlowFunc(("Generated cancelling request, rc=%Rrc\n", rc));
-    return rc;
+    GuestDnDMsg Msg;
+    Msg.setType(HOST_DND_CANCEL);
+    if (mDataBase.m_uProtocolVersion >= 3)
+        Msg.setNextUInt32(0); /** @todo ContextID not used yet. */
+
+    LogRel2(("DnD: Cancelling operation on guest ..."));
+
+    return GuestDnDInst()->hostCall(Msg.getType(), Msg.getCount(), Msg.getParms());
 }
 

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

@@ -652 +652 @@
         {
             delete pTask;
-            LogRel2(("DnD: Could not create SendDataTask object \n"));
+            LogRel2(("DnD: Could not create SendDataTask object\n"));
             throw hr = E_FAIL;
         }
@@ -686 +686 @@
     return hr;
 #endif /* VBOX_WITH_DRAG_AND_DROP */
-}
-
-int GuestDnDTarget::i_cancelOperation(void)
-{
-    /** @todo Check for pending cancel requests. */
-
-#if 0 /** @todo Later. */
-    /* Cancel any outstanding waits for guest responses first. */
-    if (pResp)
-        pResp->notifyAboutGuestResponse();
-#endif
-
-    LogFlowFunc(("Cancelling operation, telling guest ...\n"));
-
-    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());
 }
 
@@ -1553 +1533 @@
 #else /* VBOX_WITH_DRAG_AND_DROP */
 
-    int rc = i_cancelOperation();
+    int rc = GuestDnDBase::sendCancel();
 
     if (aVeto)