Changeset 50265 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnD.cpp

Timestamp:

Jan 29, 2014 11:12:44 AM (11 years ago)

Author:

vboxsync

Message:

DnD: First working implementation for Windows guest->host support; still work in progress. As for now only pure text data can be dragged over.

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnD.cpp (modified) (14 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnD.cpp

@@ -229 +229 @@
         } while (RT_SUCCESS(rc));
 
+        int rc2 = pThis->UnregisterAsDropTarget();
+        if (RT_SUCCESS(rc))
+            rc = rc2;
+
         OleUninitialize();
     }
@@ -405 +409 @@
                     reset();
 
-                    Assert(mMode == Unknown);
                     mMode = HG;
 
@@ -464 +467 @@
 
                     rc = OnHgCancel();
-
-                    reset();
                     break;
                 }
@@ -473 +474 @@
                     LogFlowThisFunc(("HOST_DND_GH_REQ_PENDING\n"));
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
-                    Assert(   mMode == Unknown
-                           || mMode == GH);
-                    mMode = GH;
-                    rc = OnGhIsDnDPending(pEvent->Event.uScreenId);
+                    if (   mMode == Unknown
+                        /* There can be more than one HOST_DND_GH_REQ_PENDING
+                         * messages coming in. */
+                        || mMode == GH)
+                    {
+                        mMode = GH;
+                        rc = OnGhIsDnDPending(pEvent->Event.uScreenId);
+                    }
+                    else
+                        rc = VERR_WRONG_ORDER;
 #else
                     rc = VERR_NOT_SUPPORTED;
@@ -487 +494 @@
                     LogFlowThisFunc(("HOST_DND_GH_EVT_DROPPED\n"));
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
-                    Assert(mMode == GH);
-                    rc = OnGhDropped(pEvent->Event.pszFormats,
-                                     pEvent->Event.cbFormats,
-                                     pEvent->Event.u.a.uDefAction);
-                    mMode = Unknown;
+                    if (mMode == GH)
+                    {
+                        rc = OnGhDropped(pEvent->Event.pszFormats,
+                                         pEvent->Event.cbFormats,
+                                         pEvent->Event.u.a.uDefAction);
+                    }
+                    else
+                        rc = VERR_WRONG_ORDER;
 #else
                     rc = VERR_NOT_SUPPORTED;
@@ -585 +595 @@
         }
         else
+        {
             rc = VINF_SUCCESS;
+        }
     }
     catch (std::bad_alloc)
@@ -598 +610 @@
 int VBoxDnDWnd::UnregisterAsDropTarget(void)
 {
+    LogFlowFuncEnter();
+
     if (!pDropTarget) /* No drop target? Bail out. */
         return VINF_SUCCESS;
@@ -606 +620 @@
                                   TRUE /* fLastUnlockReleases */);
     if (SUCCEEDED(hr))
-        pDropTarget->Release();
+    {
+        ULONG cRefs = pDropTarget->Release();
+
+        Assert(cRefs == 0);
+        pDropTarget = NULL;
+    }
 
     int rc = SUCCEEDED(hr)
@@ -652 +671 @@
      */
     const RTCList<RTCString> lstAllowedMimeTypes = RTCList<RTCString>()
-        /* Uri's */
+        /* URI's */
         << "text/uri-list"
         /* Text */
@@ -661 +680 @@
         << "TEXT"
         << "STRING"
-        /* OpenOffice formates */
+        /* OpenOffice formats */
         << "application/x-openoffice-embed-source-xml;windows_formatname=\"Star Embed Source (XML)\""
         << "application/x-openoffice-drawing;windows_formatname=\"Drawing Format\"";
@@ -855 +874 @@
     if (RT_SUCCESS(rc))
         rc = rc2;
+
+    reset();
 
     return rc;
@@ -959 +980 @@
     if (RT_SUCCESS(rc))
     {
+        AssertPtr(pDropTarget);
+
         uint32_t uDefAction = DND_IGNORE_ACTION;
         RTCString strFormat = "unknown";
-        if (   pDropTarget
-            && pDropTarget->HasData())
+        if (pDropTarget->HasData())
         {
             uDefAction = DND_COPY_ACTION;
@@ -970 +992 @@
              *        with \r\n. */
             strFormat = "text/plain;charset=utf-8";
-        }
-
-        LogFlowFunc(("Acknowledging pDropTarget=0x%p, uDefAction=0x%x, uAllActions=0x%x, strFormat=%s\n",
-                     pDropTarget, uDefAction, uAllActions, strFormat.c_str()));
-        rc = VbglR3DnDGHAcknowledgePending(mClientID,
-                                           uDefAction, uAllActions, strFormat.c_str());
+
+            LogFlowFunc(("Acknowledging pDropTarget=0x%p, uDefAction=0x%x, uAllActions=0x%x, strFormat=%s\n",
+                         pDropTarget, uDefAction, uAllActions, strFormat.c_str()));
+            rc = VbglR3DnDGHAcknowledgePending(mClientID,
+                                               uDefAction, uAllActions, strFormat.c_str());
+        }
     }
 
@@ -985 +1007 @@
                             uint32_t uDefAction)
 {
-    LogFlowThisFunc(("mMode=%ld, mState=%ld, cbFormats=%RU32, uDefAction=0x%x\n",
-                     mMode, mState, cbFormats, uDefAction));
+    LogFlowThisFunc(("mMode=%ld, mState=%ld, pDropTarget=0x%p, cbFormats=%RU32, uDefAction=0x%x\n",
+                     mMode, mState, pDropTarget, cbFormats, uDefAction));
     int rc;
     if (mState == Dragging)
     {
         AssertPtr(pDropTarget);
+        rc = pDropTarget->WaitForDrop(30 * 1000 /* Timeout */);
+        if (RT_SUCCESS(rc))
+        {
+            /** @todo Respect uDefAction. */
+            /** @todo Do data checking / conversion based on pszFormats. */
+
+            void *pvData = pDropTarget->DataMutableRaw();
+            AssertPtr(pvData);
+            uint32_t cbData = pDropTarget->DataSize();
+            Assert(cbData);
+
+            rc = VbglR3DnDGHSendData(mClientID, pvData, cbData);
+            LogFlowFunc(("Sent pvData=0x%p, cbData=%RU32, rc=%Rrc\n",
+                         pvData, cbData, rc));
+        }
+
+        reset();
     }
     else