Changeset 50305 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Feb 3, 2014 10:47:45 AM (11 years ago)

Author:

vboxsync

Message:

DnD: Update.

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• VBoxDnD.cpp (modified) (6 diffs)
• VBoxDnD.h (modified) (3 diffs)
• VBoxDnDDropTarget.cpp (modified) (15 diffs)

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

@@ -515 +515 @@
                     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;
 #else
                     rc = VERR_NOT_SUPPORTED;
@@ -934 +970 @@
 #endif
 
-#if 1
         /** @todo Multi-monitor setups? */
         int iScreenX = GetSystemMetrics(SM_CXSCREEN) - 1;
@@ -963 +998 @@
         else
             LogFlowFunc(("Unable to send input, error=0x%x\n", GetLastError()));
-#else
-        SetCursorPos(p.x, p.y);
-#endif
 
 #ifdef DEBUG_andy
@@ -981 +1013 @@
     if (RT_SUCCESS(rc))
     {
+        uint32_t uDefAction = DND_IGNORE_ACTION;
+
         AssertPtr(pDropTarget);
-
-        uint32_t uDefAction = DND_IGNORE_ACTION;
-        RTCString strFormat = "unknown";
-        if (pDropTarget->HasData())
+        RTCString strFormats = pDropTarget->Formats();
+        if (!strFormats.isEmpty())
         {
             uDefAction = DND_COPY_ACTION;
             uAllActions = uDefAction;
 
-            /** @todo There can be more than one format, separated
-             *        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()));
+            LogFlowFunc(("Acknowledging pDropTarget=0x%p, uDefAction=0x%x, uAllActions=0x%x, strFormats=%s\n",
+                         pDropTarget, uDefAction, uAllActions, strFormats.c_str()));
             rc = VbglR3DnDGHAcknowledgePending(mClientID,
-                                               uDefAction, uAllActions, strFormat.c_str());
-        }
+                                               uDefAction, uAllActions, strFormats.c_str());
+        }
+        else
+            LogFlowFunc(("No format data available yet\n"));
     }
 
@@ -1008 +1038 @@
                             uint32_t uDefAction)
 {
-    LogFlowThisFunc(("mMode=%ld, mState=%ld, pDropTarget=0x%p, cbFormats=%RU32, uDefAction=0x%x\n",
-                     mMode, mState, pDropTarget, cbFormats, uDefAction));
+    AssertPtrReturn(pszFormats, VERR_INVALID_POINTER);
+    AssertReturn(cbFormats, VERR_INVALID_PARAMETER);
+
+    LogFlowThisFunc(("mMode=%ld, mState=%ld, pDropTarget=0x%p, uDefAction=0x%x\n",
+                     mMode, mState, pDropTarget, uDefAction));
+#ifdef DEBUG
+    RTCList<RTCString> lstFormats =
+        RTCString(pszFormats, cbFormats - 1).split("\r\n");
+
+    LogFlow(("cbFormats=%RU32: ", cbFormats));
+    for (size_t i = 0; i < lstFormats.size(); i++)
+        LogFlow(("'%s' ", lstFormats.at(i).c_str()));
+    LogFlow(("\n"));
+#endif
+
     int rc;
     if (mState == Dragging)
     {
         AssertPtr(pDropTarget);
-        rc = pDropTarget->WaitForDrop(30 * 1000 /* Timeout */);
+        rc = pDropTarget->WaitForDrop(30 * 1000 /* Timeout in ms */);
         if (RT_SUCCESS(rc))
         {
@@ -1035 +1078 @@
         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;

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

@@ -155 +155 @@
 public:
 
-    bool HasData(void) { return RT_BOOL(mFormatEtc.cfFormat != 0); }
     void *DataMutableRaw(void) { return mpvData; }
     uint32_t DataSize(void) { return mcbData; }
+    RTCString Formats(void);
     int WaitForDrop(RTMSINTERVAL msTimeout);
 
@@ -170 +170 @@
      *        DVTARGETDEVICE here! */
     FORMATETC mFormatEtc;
+    RTCString mFormats;
     void *mpvData;
     uint32_t mcbData;
@@ -338 +339 @@
     int OnGhIsDnDPending(uint32_t uScreenID);
     int OnGhDropped(const char *pszFormats, 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
 

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

@@ -17 +17 @@
 #include <windows.h>
 #include <new> /* For bad_alloc. */
+#include <Shlobj.h> /* For DROPFILES and friends. */
 
 #include "VBoxTray.h"
@@ -107 +108 @@
     reset();
 
+    /** @todo At the moment we only support one DnD format at a time. */
+
     /* Try different formats. CF_HDROP is the most common one, so start
      * with this. */
-    /** @todo At the moment we only support TYMED_HGLOBAL. */
     FORMATETC fmtEtc = { CF_HDROP, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
     HRESULT hr = pDataObject->QueryGetData(&fmtEtc);
-    if (hr != S_OK)
+    if (hr == S_OK)
+    {
+        mFormats = "text/uri-list";
+    }
+    else
     {
         LogFlowFunc(("CF_HDROP not supported, hr=%Rhrc\n", hr));
@@ -125 +131 @@
             fmtEtc.cfFormat = 0; /* Mark it to not supported. */
         }
+        else
+        {
+            mFormats = "text/plain;charset=utf-8";
+        }
     }
 
@@ -130 +140 @@
     if (fmtEtc.cfFormat)
     {
-        LogFlowFunc(("Found supported format %RI16\n", fmtEtc.cfFormat));
+        LogFlowFunc(("Found supported format %RI16 (%s)\n",
+                     fmtEtc.cfFormat, VBoxDnDDataObject::ClipboardFormatToString(fmtEtc.cfFormat)));
 
         /* Make a copy of the FORMATETC structure so that we later can
          * use this for comparrison and stuff. */
-        /** Note: The DVTARGETDEVICE member only is a shallow copy! */
+        /** Note: The DVTARGETDEVICE member only is a shallow copy for now! */
         memcpy(&mFormatEtc, &fmtEtc, sizeof(FORMATETC));
 
@@ -164 +175 @@
                     while (pEnumFormats->Next(1, &curFormatEtc,
                                               NULL /* pceltFetched */) == S_OK)
-                        {
+                    {
                         WCHAR wszCfName[128]; /* 128 chars should be enough, rest will be truncated. */
                         hr2 = GetClipboardFormatNameW(curFormatEtc.cfFormat, wszCfName,
                                                       sizeof(wszCfName) / sizeof(WCHAR));
-                        LogRel(("\tcfFormat=%RI16, tyMed=%RI32, dwAspect=%RI32, strCustomName=%ls, hr=%Rhrc\n",
+                        LogRel(("\tcfFormat=%RI16 (%s), tyMed=%RI32, dwAspect=%RI32, strCustomName=%ls, hr=%Rhrc\n",
                                 curFormatEtc.cfFormat,
+                                VBoxDnDDataObject::ClipboardFormatToString(curFormatEtc.cfFormat),
                                 curFormatEtc.tymed,
                                 curFormatEtc.dwAspect,
@@ -176 +188 @@
 
                     pEnumFormats->Release();
-                }
+                }
 
                 break;
@@ -236 +248 @@
 
 #ifdef DEBUG
-    LogFlowFunc(("mFormatEtc.cfFormat=%RI16, pDataObject=0x%p, grfKeyState=0x%x, x=%ld, y=%ld\n",
-                 mFormatEtc.cfFormat, pDataObject, grfKeyState, pt.x, pt.y));
+    LogFlowFunc(("mFormatEtc.cfFormat=%RI16 (%s), pDataObject=0x%p, grfKeyState=0x%x, x=%ld, y=%ld\n",
+                 mFormatEtc.cfFormat, VBoxDnDDataObject::ClipboardFormatToString(mFormatEtc.cfFormat),
+                 pDataObject, grfKeyState, pt.x, pt.y));
 #endif
     HRESULT hr = S_OK;
@@ -248 +261 @@
         hr = pDataObject->QueryGetData(&mFormatEtc);
         AssertMsg(SUCCEEDED(hr),
-                  ("Data format changed between DragEnter() and Drop(), cfFormat=%RI16, hr=%Rhrc\n",
-                  mFormatEtc.cfFormat, hr));
-    }
+                  ("Data format changed between DragEnter() and Drop(), cfFormat=%RI16 (%s), hr=%Rhrc\n",
+                  mFormatEtc.cfFormat, VBoxDnDDataObject::ClipboardFormatToString(mFormatEtc.cfFormat),
+                  hr));
+    }
+
+    int rc = VINF_SUCCESS;
 
     if (SUCCEEDED(hr))
@@ -272 +288 @@
                         LogFlowFunc(("Locking HGLOBAL storage failed with %Rrc\n",
                                      RTErrConvertFromWin32(GetLastError())));
-                        hr = ERROR_INVALID_HANDLE;
+                        rc = VERR_INVALID_HANDLE;
+                        hr = E_INVALIDARG; /* Set special hr for OLE. */
                     }
                     break;
@@ -279 +296 @@
                     AssertMsgFailed(("Storage medium type %RI32 supported\n",
                                      mFormatEtc.tymed));
-                    hr = ERROR_NOT_SUPPORTED;
+                    rc = VERR_NOT_SUPPORTED;
+                    hr = DV_E_TYMED; /* Set special hr for OLE. */
                     break;
             }
 
-            if (SUCCEEDED(hr))
+            if (RT_SUCCESS(rc))
             {
                 /* Second stage: Do the actual copying of the data object's data,
@@ -289 +307 @@
                 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_TEXT:
                     {
-                        LogFlowFunc(("pvData=%s\n", (char*)pvData));
-
-                        uint32_t cbSize = strlen((char*)pvData); /** @todo Evil hack, fix this! */
-                        mpvData = RTMemDup(pvData, cbSize);
-                        mcbData = cbSize;
+                        AssertPtr(pvData);
+                        size_t cbSize = GlobalSize(pvData);
+                        LogFlowFunc(("CF_TEXT 0x%p got %zu bytes\n", pvData, cbSize));
+                        if (cbSize)
+                        {
+                            char *pszText = NULL;
+                            rc = RTStrCurrentCPToUtf8(&pszText, (char *)pvData);
+                            if (RT_SUCCESS(rc))
+                            {
+                                mpvData = (void *)pszText;
+                                mcbData = strlen(pszText) + 1;
+                            }
+                        }
+
                         break;
                     }
 
                     case CF_HDROP:
+                    {
+                        AssertPtr(pvData);
+
+                        /* Convert to a string list, separated by \r\n. */
+                        DROPFILES *pDropFiles = (DROPFILES *)pvData;
+                        AssertPtr(pDropFiles);
+                        bool fUnicode = RT_BOOL(pDropFiles->fWide);
+
+                        /* Get the offset of the file list. */
+                        Assert(pDropFiles->pFiles >= sizeof(DROPFILES));
+                        /* Note: This is *not* pDropFiles->pFiles! DragQueryFile only
+                         *       will work with the plain storage medium pointer! */
+                        HDROP hDrop = (HDROP)(pvData);
+
+                        /* First, get the file count. */
+                        /** @todo Does this work on Windows 2000 / NT4? */
+                        char *pszFiles = NULL;
+                        uint32_t cchFiles = 0;
+                        UINT cFiles = DragQueryFile(hDrop, UINT32_MAX /* iFile */,
+                                                    NULL /* lpszFile */, 0 /* cchFile */);
+                        LogFlowFunc(("CF_HDROP got %RU16 file(s)\n", cFiles));
+
+                        for (UINT i = 0; i < cFiles; i++)
+                        {
+                            UINT cch = DragQueryFile(hDrop, i /* File index */,
+                                                     NULL /* Query size first */,
+                                                     0 /* cchFile */);
+                            Assert(cch);
+
+                            /* Add separation between filenames. */
+                            if (i > 0)
+                            {
+                                rc = RTStrAAppendExN(&pszFiles, 1 /* cPairs */,
+                                                     "\r\n", 2 /* Bytes */);
+                                if (RT_SUCCESS(rc))
+                                    cchFiles += 2; /* Include \r\n */
+                            }
+
+                            if (RT_FAILURE(rc))
+                                return rc;
+
+                            char *pszFile = NULL; /* UTF-8 version. */
+                            UINT cchFile = 0;
+                            if (fUnicode)
+                            {
+                                /* Allocate enough space (including terminator). */
+                                WCHAR *pwszFile = (WCHAR *)RTMemAlloc((cch + 1) * sizeof(WCHAR));
+                                if (pwszFile)
+                                {
+                                    cchFile = DragQueryFileW(hDrop, i /* File index */,
+                                                             pwszFile, cch + 1 /* Include terminator */);
+                                    AssertMsg(cchFile == cch, ("cchCopied (%RU16) does not match cchFile (%RU16)\n",
+                                                               cchFile, cch));
+                                    int rc2 = RTUtf16ToUtf8(pwszFile, &pszFile);
+                                    AssertRC(rc2);
+                                }
+                                else
+                                    rc = VERR_NO_MEMORY;
+                            }
+                            else /* ANSI */
+                            {
+                                /* Allocate enough space (including terminator). */
+                                pszFile = (char *)RTMemAlloc((cch + 1) * sizeof(char));
+                                if (pszFile)
+                                {
+                                    cchFile = DragQueryFileA(hDrop, i /* File index */,
+                                                             pszFile, cchFile + 1 /* Include terminator */);
+                                    AssertMsg(cchFile == cch, ("cchCopied (%RU16) does not match cchFile (%RU16)\n",
+                                                               cchFile, cch));
+                                }
+                                else
+                                    rc = VERR_NO_MEMORY;
+                            }
+
+                            if (RT_SUCCESS(rc))
+                            {
+                                LogFlowFunc(("\tFile: %s (%RU32 characters)\n",
+                                             pszFile, cchFile));
+
+                                rc = RTStrAAppendExN(&pszFiles, 1 /* cPairs */,
+                                                     pszFile, cchFile);
+                            }
+
+                            /* Termination. */
+                            pszFiles[cchFiles] = '\0';
+
+                            if (pszFile)
+                                RTMemFree(pszFile);
+
+                            if (RT_FAILURE(rc))
+                                break;
+                        }
+
+                        if (RT_SUCCESS(rc))
+                        {
+                            uint32_t cbSize = cchFiles * sizeof(char);
+                            Assert(cbSize);
+
+                            mpvData = RTMemDup(pszFiles, cbSize);
+                            mcbData = cbSize;
+                        }
+
+                        LogFlowFunc(("Building CF_HDROP list rc=%Rrc, pszFiles=0x%p, cFiles=%RU16, cchFiles=%RU32\n",
+                                     rc, pszFiles, cFiles, cchFiles));
+
+                        if (pszFiles)
+                            RTStrFree(pszFiles);
                         break;
+                    }
 
                     default:
-                        AssertMsgFailed(("Format of type %RI16 supported\n",
-                                         mFormatEtc.cfFormat));
+                        AssertMsgFailed(("Format of type %RI16 (%s) not supported\n",
+                                         mFormatEtc.cfFormat,
+                                         VBoxDnDDataObject::ClipboardFormatToString(mFormatEtc.cfFormat)));
                         hr = ERROR_NOT_SUPPORTED;
+                        hr = DV_E_CLIPFORMAT; /* Set special hr for OLE. */
                         break;
                 }
@@ -320 +459 @@
 
                 default:
-                    AssertMsgFailed(("Storage medium type %RI32 supported\n",
-                                     mFormatEtc.tymed));
-                    hr = ERROR_NOT_SUPPORTED;
+                    AssertMsgFailed(("Really should not happen -- see init stage!\n"));
                     break;
             }
@@ -329 +466 @@
             ReleaseStgMedium(&stgMed);
 
-            if (SUCCEEDED(hr))
+            /** @todo Signal in any case to avoid hangs/timeouts? */
+            if (RT_SUCCESS(rc))
             {
                 RTSemEventSignal(hEventDrop);
@@ -349 +487 @@
         mpWndParent->hide();
 
-    LogFlowFunc(("Returning with mFormatEtc.cfFormat=%RI16, fCanDrop=%RTbool, *pdwEffect=%RI32\n",
-                 mFormatEtc.cfFormat, fCanDrop, *pdwEffect));
+    LogFlowFunc(("Returning with rc=%Rrc, mFormatEtc.cfFormat=%RI16 (%s), fCanDrop=%RTbool, *pdwEffect=%RI32\n",
+                 rc, mFormatEtc.cfFormat, VBoxDnDDataObject::ClipboardFormatToString(mFormatEtc.cfFormat),
+                 fCanDrop, *pdwEffect));
+
     return hr;
 }
@@ -395 +535 @@
     mcbData = 0;
     RT_ZERO(mFormatEtc);
+    mFormats = "";
+}
+
+RTCString VBoxDnDDropTarget::Formats(void)
+{
+    return mFormats;
 }