Changeset 50561 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray

Timestamp:

Feb 24, 2014 9:07:22 PM (11 years ago)

Author:

vboxsync

Message:

DnD: Update, bugfixes.

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• VBoxDnD.cpp (modified) (25 diffs)
• VBoxDnD.h (modified) (3 diffs)
• VBoxDnDDropTarget.cpp (modified) (4 diffs)

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

@@ -60 +60 @@
 VBoxDnDWnd::VBoxDnDWnd(void)
     : hWnd(NULL),
+      uAllActions(DND_IGNORE_ACTION),
       mfMouseButtonDown(false),
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
@@ -69 +70 @@
 {
     RT_ZERO(startupInfo);
-
-    reset();
 }
 
@@ -209 +208 @@
     else
     {
-        LogRelFunc(("Unable to initialize OLE, hr=%Rhrc\n", hr));
+        LogRel(("DnD: Unable to initialize OLE, hr=%Rhrc\n", hr));
         rc = VERR_COM_UNEXPECTED;
     }
@@ -380 +379 @@
             else if (mMode == GH) /* Guest to host. */
             {
-                //hide();
-
                 /* Starting here VBoxDnDDropTarget should
                  * take over; was instantiated when registering
@@ -405 +402 @@
         {
             VBOXDNDEVENT *pEvent = (PVBOXDNDEVENT)lParam;
-            AssertPtr(pEvent);
+            if (!pEvent)
+                break; /* No event received, bail out. */
 
             LogFlowThisFunc(("Received uType=%RU32, uScreenID=%RU32\n",
@@ -416 +414 @@
                 {
                     LogFlowThisFunc(("HOST_DND_HG_EVT_ENTER\n"));
-
-                    reset();
-
-                    mMode = HG;
 
                     if (pEvent->Event.cbFormats)
@@ -484 +478 @@
                     LogFlowThisFunc(("HOST_DND_GH_REQ_PENDING\n"));
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
-                    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;
+                    rc = OnGhIsDnDPending(pEvent->Event.uScreenId);
+
 #else
                     rc = VERR_NOT_SUPPORTED;
@@ -504 +490 @@
                     LogFlowThisFunc(("HOST_DND_GH_EVT_DROPPED\n"));
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
-                    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;
-#endif
-                    break;
-                }
-
-                case DragAndDropSvc::GUEST_DND_GH_EVT_ERROR:
-                {
-                    LogFlowThisFunc(("GUEST_DND_GH_EVT_ERROR\n"));
-#ifdef VBOX_WITH_DRAG_AND_DROP_GH
-                    reset();
-                    rc = VINF_SUCCESS; /** @todo GUEST_DND_GH_EVT_ERROR */
-#else
-                    rc = VERR_NOT_SUPPORTED;
-#endif
-                    break;
-                }
-
-                case DragAndDropSvc::HOST_DND_GH_RECV_DIR:
-                {
-                    LogFlowThisFunc(("HOST_DND_GH_RECV_DIR\n"));
-#ifdef VBOX_WITH_DRAG_AND_DROP_GH
-                    if (mMode == GH)
-                    {
-                        rc = OnGhSendDir(pEvent->Event.pszFormats,
-                                         pEvent->Event.cbFormats,
-                                         pEvent->Event.u.a.uDefAction);
-                    }
-                    else
-                        rc = VERR_WRONG_ORDER;
-#else
-                    rc = VERR_NOT_SUPPORTED;
-#endif
-                    break;
-                }
-
-                case DragAndDropSvc::HOST_DND_GH_RECV_FILE:
-                {
-                    LogFlowThisFunc(("HOST_DND_GH_RECV_FILE\n"));
-#ifdef VBOX_WITH_DRAG_AND_DROP_GH
-                    if (mMode == GH)
-                    {
-                        rc = OnGhSendFile(pEvent->Event.pszFormats,
-                                          pEvent->Event.cbFormats,
-                                          pEvent->Event.u.a.uDefAction);
-                    }
-                    else
-                        rc = VERR_WRONG_ORDER;
+                    rc = OnGhDropped(pEvent->Event.pszFormats,
+                                     pEvent->Event.cbFormats,
+                                     pEvent->Event.u.a.uDefAction);
 #else
                     rc = VERR_NOT_SUPPORTED;
@@ -600 +533 @@
             }
 
-            LogFlowThisFunc(("Processing event %RU32 resulted in rc=%Rrc\n",
-                             pEvent->Event.uType, rc));
             if (pEvent)
+            {
+                LogFlowThisFunc(("Processing event %RU32 resulted in rc=%Rrc\n",
+                                 pEvent->Event.uType, rc));
+
                 RTMemFree(pEvent);
+            }
             return 0;
         }
@@ -702 +638 @@
 int VBoxDnDWnd::OnHgEnter(const RTCList<RTCString> &lstFormats, uint32_t uAllActions)
 {
+    if (mMode == GH) /* Wrong mode? Bail out. */
+        return VERR_WRONG_ORDER;
+
 #ifdef DEBUG
     LogFlowThisFunc(("uActions=0x%x, lstFormats=%zu: ", uAllActions, lstFormats.size()));
@@ -708 +647 @@
     LogFlow(("\n"));
 #endif
+
+    reset();
+    setMode(HG);
 
     /* Save all allowed actions. */
@@ -779 +721 @@
 int VBoxDnDWnd::OnHgMove(uint32_t u32xPos, uint32_t u32yPos, uint32_t uAction)
 {
-    LogFlowThisFunc(("u32xPos=%RU32, u32yPos=%RU32, uAction=0x%x\n",
-                     u32xPos, u32yPos, uAction));
-
-    int rc = mouseMove(u32xPos, u32yPos, MOUSEEVENTF_LEFTDOWN);
+    int rc;
 
     uint32_t uActionNotify = DND_IGNORE_ACTION;
-    if (RT_SUCCESS(rc))
-        rc = RTCritSectEnter(&mCritSect);
-    if (RT_SUCCESS(rc))
-    {
-        if (   (Dragging == mState)
-            && startupInfo.pDropSource)
-            uActionNotify = startupInfo.pDropSource->GetCurrentAction();
-
-        RTCritSectLeave(&mCritSect);
-    }
+    if (mMode == HG)
+    {
+        LogFlowThisFunc(("u32xPos=%RU32, u32yPos=%RU32, uAction=0x%x\n",
+                         u32xPos, u32yPos, uAction));
+
+        rc = mouseMove(u32xPos, u32yPos, MOUSEEVENTF_LEFTDOWN);
+
+        if (RT_SUCCESS(rc))
+            rc = RTCritSectEnter(&mCritSect);
+        if (RT_SUCCESS(rc))
+        {
+            if (   (Dragging == mState)
+                && startupInfo.pDropSource)
+                uActionNotify = startupInfo.pDropSource->GetCurrentAction();
+
+            RTCritSectLeave(&mCritSect);
+        }
+    }
+    else /* Just acknowledge the operation with an ignore action. */
+        rc = VINF_SUCCESS;
 
     if (RT_SUCCESS(rc))
@@ -809 +758 @@
 int VBoxDnDWnd::OnHgLeave(void)
 {
+    if (mMode == GH) /* Wrong mode? Bail out. */
+        return VERR_WRONG_ORDER;
+
     LogFlowThisFunc(("mMode=%ld, mState=%RU32\n", mMode, mState));
     LogRel(("DnD: Drag'n drop operation aborted\n"));
@@ -826 +778 @@
 int VBoxDnDWnd::OnHgDrop(void)
 {
+    if (mMode == GH)
+        return VERR_WRONG_ORDER;
+
     LogFlowThisFunc(("mMode=%ld, mState=%RU32\n", mMode, mState));
 
@@ -917 +872 @@
                      mMode, mState, uScreenID));
 
+    if (mMode == Unknown)
+        setMode(GH);
+
+    if (mMode != GH)
+        return VERR_WRONG_ORDER;
+
     if (mState == Uninitialized)
-        reset();
+    {
+        /* Nothing to do here yet. */
+        mState = Initialized;
+    }
 
     int rc;
@@ -954 +918 @@
 
     if (   RT_SUCCESS(rc)
-        && (mState == Dragging))
+        && mState == Dragging)
     {
         /** @todo Put this block into a function! */
@@ -987 +951 @@
         {
             uDefAction = DND_COPY_ACTION;
+            /** @todo Support more than one action at a time. */
             uAllActions = uDefAction;
 
@@ -993 +958 @@
             rc = VbglR3DnDGHAcknowledgePending(mClientID,
                                                uDefAction, uAllActions, strFormats.c_str());
+            if (RT_FAILURE(rc))
+            {
+                char szMsg[256]; /* Sizes according to MSDN. */
+                char szTitle[64];
+
+                /** @todo Add some translation macros here. */
+                RTStrPrintf(szTitle, sizeof(szTitle), "VirtualBox Guest Additions Drag'n Drop");
+                RTStrPrintf(szMsg, sizeof(szMsg), "Drag'n drop to the host either is not supported or disabled. "
+                                                  "Pleas enable Guest to Host or Bidirectional drag'n drop mode "
+                                                  "or re-install the VirtualBox Guest Additions.");
+                switch (rc)
+                {
+                    case VERR_ACCESS_DENIED:
+                        rc = hlpShowBalloonTip(ghInstance, ghwndToolWindow, ID_TRAYICON,
+                                               szMsg, szTitle,
+                                               15 * 1000 /* Time to display in msec */, NIIF_INFO);
+                        AssertRC(rc);
+                        break;
+
+                    default:
+                        break;
+                }
+            }
         }
         else
@@ -1010 +998 @@
     LogFlowThisFunc(("mMode=%ld, mState=%ld, pDropTarget=0x%p, pszFormat=%s, uDefAction=0x%x\n",
                      mMode, mState, pDropTarget, pszFormat, uDefAction));
-
     int rc;
-    if (mState == Dragging)
-    {
-        AssertPtr(pDropTarget);
-        rc = pDropTarget->WaitForDrop(30 * 1000 /* Timeout in ms */);
+    if (mMode == GH)
+    {
+        if (mState == Dragging)
+        {
+            AssertPtr(pDropTarget);
+            rc = pDropTarget->WaitForDrop(30 * 1000 /* Timeout in ms */);
+
+            reset();
+        }
+        else if (mState == Dropped)
+        {
+            rc = VINF_SUCCESS;
+        }
+        else
+            rc = VERR_WRONG_ORDER;
+
         if (RT_SUCCESS(rc))
         {
@@ -1027 +1026 @@
             LogFlowFunc(("Sent pvData=0x%p, cbData=%RU32, rc=%Rrc\n",
                          pvData, cbData, rc));
-        }
-
-        reset();
+
+
+        }
     }
     else
         rc = VERR_WRONG_ORDER;
 
-    LogFlowFuncLeaveRC(rc);
-    return rc;
-}
-
-int VBoxDnDWnd::OnGhSendDir(const char *pszFormats, uint32_t cbFormats,
-                            uint32_t uDefAction)
-{
-    int rc = 0;
-    LogFlowFuncLeaveRC(rc);
-    return rc;
-}
-
-int VBoxDnDWnd::OnGhSendFile(const char *pszFormats, uint32_t cbFormats,
-                             uint32_t uDefAction)
-{
-    int rc = 0;
     LogFlowFuncLeaveRC(rc);
     return rc;
@@ -1213 +1196 @@
 void VBoxDnDWnd::reset(void)
 {
-    LogFlowThisFunc(("Old mState=%ld\n", mState));
+    LogFlowThisFunc(("Resetting, old mMode=%ld, mState=%ld\n",
+                     mMode, mState));
 
     lstAllowedFormats.clear();
@@ -1219 +1203 @@
     uAllActions = DND_IGNORE_ACTION;
 
-    mMode = Unknown;
+    int rc2 = setMode(Unknown);
+    AssertRC(rc2);
+
+    hide();
+}
+
+int VBoxDnDWnd::setMode(Mode enmMode)
+{
+    LogFlowThisFunc(("Old mode=%ld, new mode=%ld\n",
+                     mMode, enmMode));
+
+    mMode = enmMode;
     mState = Initialized;
+
+    return VINF_SUCCESS;
 }
 
@@ -1425 +1422 @@
             if (RT_FAILURE(rc2))
                 LogFlowFunc(("Cancelling failed with rc=%Rrc\n", rc2));
+            break;
         }
         else
@@ -1433 +1431 @@
              * don't support the stuff we do on the guest side, so make sure we
              * don't process invalid messages forever. */
-            if (rc == VERR_INVALID_PARAMETER)
-                cMsgSkippedInvalid++;
-            if (cMsgSkippedInvalid > 3)
+            if (cMsgSkippedInvalid++ > 3)
             {
-                LogFlowFunc(("Too many invalid/skipped messages from host, exiting ...\n"));
+                LogRel(("DnD: Too many invalid/skipped messages from host, exiting ...\n"));
                 break;
             }
+
+            int rc2 = VbglR3DnDGHSendError(uClientID, rc);
+            AssertRC(rc2);
         }
 
@@ -1445 +1444 @@
             break;
 
+        if (RT_FAILURE(rc)) /* Don't hog the CPU on errors. */
+            RTThreadSleep(1000 /* ms */);
+
     } while (true);
 

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

@@ -340 +340 @@
     int OnGhIsDnDPending(uint32_t uScreenID);
     int OnGhDropped(const char *pszFormat, uint32_t cbFormats, uint32_t uDefAction);
-    int OnGhSendDir(const char *pszFormats, uint32_t cbFormats, uint32_t uDefAction);
-    int OnGhSendFile(const char *pszFormats, uint32_t cbFormats, uint32_t uDefAction);
 #endif
 
@@ -353 +351 @@
 
     int makeFullscreen(void);
-    void reset(void);
     int mouseMove(int x, int y, DWORD dwMouseInputFlags);
     int mouseRelease(void);
+    void reset(void);
+    int setMode(Mode enmMode);
 
 public: /** @todo Make protected! */
@@ -396 +395 @@
     /** The current state. */
     State                      mState;
+    bool                       mInFlight;
     RTCString                  mFormatRequested;
     RTCList<RTCString>         mLstFormats;

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

@@ -120 +120 @@
     else
     {
-        LogFlowFunc(("CF_HDROP not supported, hr=%Rhrc\n", hr));
+        LogFlowFunc(("CF_HDROP not wanted, hr=%Rhrc\n", hr));
 
         /* So we couldn't retrieve the data in CF_HDROP format; try with
-         * CF_TEXT format now. Rest stays the same. */
-        fmtEtc.cfFormat = CF_TEXT;
+         * CF_UNICODETEXT + CF_TEXT formats now. Rest stays the same. */
+        fmtEtc.cfFormat = CF_UNICODETEXT;
         hr = pDataObject->QueryGetData(&fmtEtc);
-        if (hr != S_OK)
+        if (hr == S_OK)
         {
-            LogFlowFunc(("CF_TEXT not supported, hr=%Rhrc\n", hr));
-            fmtEtc.cfFormat = 0; /* Mark it to not supported. */
+            mFormats = "text/plain;charset=utf-8";
         }
         else
         {
-            mFormats = "text/plain;charset=utf-8";
+            LogFlowFunc(("CF_UNICODETEXT not wanted, hr=%Rhrc\n", hr));
+
+            fmtEtc.cfFormat = CF_TEXT;
+            hr = pDataObject->QueryGetData(&fmtEtc);
+            if (hr == S_OK)
+            {
+                mFormats = "text/plain;charset=utf-8";
+            }
+            else
+            {
+                LogFlowFunc(("CF_TEXT not wanted, hr=%Rhrc\n", hr));
+                fmtEtc.cfFormat = 0; /* Mark it to not supported. */
+            }
         }
     }
@@ -306 +317 @@
                 switch (mFormatEtc.cfFormat)
                 {
-                    /* Handling CF_TEXT means that the system already did some marshalling
-                     * to convert RTF or unicode text to plain ANSI text. */
+                    case CF_UNICODETEXT:
+                    {
+                        AssertPtr(pvData);
+                        size_t cbSize = GlobalSize(pvData);
+                        LogFlowFunc(("CF_UNICODETEXT 0x%p got %zu bytes\n", pvData, cbSize));
+                        if (cbSize)
+                        {
+                            char *pszText = NULL;
+                            rc = RTUtf16ToUtf8((PCRTUTF16)pvData, &pszText);
+                            if (RT_SUCCESS(rc))
+                            {
+                                mpvData = (void *)pszText;
+                                mcbData = strlen(pszText) + 1; /* Include termination. */
+
+                                /* Note: Don't free data of pszText, mpvData now owns it. */
+                            }
+                        }
+
+                        break;
+                    }
+
                     case CF_TEXT:
                     {
@@ -320 +350 @@
                             {
                                 mpvData = (void *)pszText;
-                                mcbData = strlen(pszText) + 1;
+                                mcbData = strlen(pszText) + 1; /* Include termination. */
+
+                                /* Note: Don't free data of pszText, mpvData now owns it. */
                             }
                         }
@@ -412 +444 @@
                             /* Add separation between filenames.
                              * Note: Also do this for the last element of the list. */
-                            if (i > 0)
-                            {
-                                rc = RTStrAAppendExN(&pszFiles, 1 /* cPairs */,
-                                                     "\r\n", 2 /* Bytes */);
-                                if (RT_SUCCESS(rc))
-                                    cchFiles += 2; /* Include \r\n */
-                            }
+                            rc = RTStrAAppendExN(&pszFiles, 1 /* cPairs */,
+                                                 "\r\n", 2 /* Bytes */);
+                            if (RT_SUCCESS(rc))
+                                cchFiles += 2; /* Include \r\n */
                         }