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

Timestamp:

Jan 17, 2014 11:33:40 PM (11 years ago)

Author:

vboxsync

Message:

DnD/VBoxTray: Update; implemented own drop target for guest->host support (work in progress).

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxDnD.cpp (modified) (23 diffs)
• VBoxDnD.h (modified) (4 diffs)
• VBoxDnDDataObject.cpp (modified) (5 diffs)

trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk

@@ -5 +5 @@
 
 #
-# Copyright (C) 2006-2012 Oracle Corporation
+# Copyright (C) 2006-2014 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -49 +49 @@
         VBoxDnDDataObject.cpp \
         VBoxDnDEnumFormat.cpp \
-        VBoxDnDDropSource.cpp
+        VBoxDnDDropSource.cpp \
+        VBoxDnDDropTarget.cpp
 endif
 ifdef VBOX_WITH_GUEST_PROPS

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -25 +25 @@
 #include <iprt/asm.h>
 #include <iprt/assert.h>
-#include <iprt/critsect.h>
 #include <iprt/err.h>
 #include <iprt/ldr.h>
@@ -44 +43 @@
 #endif
 
+/** @todo Merge this with messages from VBoxTray.h. */
 #define WM_VBOXTRAY_DND_MESSAGE       WM_APP + 401
 
 static LRESULT CALLBACK vboxDnDWndProcInstance(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 static LRESULT CALLBACK vboxDnDWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-
-struct VBOXDNDCONTEXT;
-class VBoxDnDWnd;
-
-/*
- * A drag'n drop event from the host.
- */
-typedef struct VBOXDNDEVENT
-{
-    /** The actual event data. */
-    VBGLR3DNDHGCMEVENT Event;
-
-} VBOXDNDEVENT, *PVBOXDNDEVENT;
-
-/**
- * DnD context data.
- */
-typedef struct VBOXDNDCONTEXT
-{
-    /** Pointer to the service environment. */
-    const VBOXSERVICEENV      *pEnv;
-    /** Shutdown indicator. */
-    bool                       fShutdown;
-    /** Thread handle for main event queue
-     *  processing. */
-    RTTHREAD                   hEvtQueue;
-    /** The DnD main event queue. */
-    RTCMTList<VBOXDNDEVENT>    lstEvtQueue;
-    /** Semaphore for waiting on main event queue
-     *  events. */
-    RTSEMEVENT                 hEvtQueueSem;
-    /** List of drag'n drop windows. At
-     *  the moment only one source is supported. */
-    RTCMTList<VBoxDnDWnd*>     lstWnd;
-
-} VBOXDNDCONTEXT, *PVBOXDNDCONTEXT;
-static VBOXDNDCONTEXT gCtx = {0};
-
-/**
- * Everything which is required to successfully start
- * a drag'n drop operation via DoDragDrop().
- */
-typedef struct VBOXDNDSTARTUPINFO
-{
-    /** Our DnD data object, holding
-     *  the raw DnD data. */
-    VBoxDnDDataObject         *pDataObject;
-    /** The drop source for sending the
-     *  DnD request to a IDropTarget. */
-    VBoxDnDDropSource         *pDropSource;
-    /** The DnD effects which are wanted / allowed. */
-    DWORD                      dwOKEffects;
-
-} VBOXDNDSTARTUPINFO, *PVBOXDNDSTARTUPINFO;
-
-/**
- * Class for handling a DnD proxy window.
- ** @todo Unify this and VBoxClient's DragInstance!
- */
-class VBoxDnDWnd
-{
-    enum State
-    {
-        Uninitialized,
-        Initialized,
-        Dragging,
-        Dropped,
-        Canceled
-    };
-
-    enum Mode
-    {
-        Unknown,
-        HG,
-        GH
-    };
-
-public:
-
-    VBoxDnDWnd(void);
-    virtual ~VBoxDnDWnd(void);
-
-public:
-
-    int Initialize(PVBOXDNDCONTEXT pContext);
-
-public:
-
-    /** The window's thread for the native message pump and
-     *  OLE context. */
-    static int Thread(RTTHREAD hThread, void *pvUser);
-
-public:
-
-    static BOOL CALLBACK MonitorEnumProc(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMonitor, LPARAM lParam);
-    /** The per-instance wndproc routine. */
-    LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
-
-public:
-
-    int DragRelease(void);
-
-    int OnCreate(void);
-    void OnDestroy(void);
-
-    /* H->G */
-    int OnHgEnter(const RTCList<RTCString> &formats, uint32_t uAllActions);
-    int OnHgMove(uint32_t u32xPos, uint32_t u32yPos, uint32_t uAllActions);
-    int OnHgDrop(void);
-    int OnHgLeave(void);
-    int OnHgDataReceived(const void *pvData, uint32_t cData);
-    int OnHgCancel(void);
-
-#ifdef VBOX_WITH_DRAG_AND_DROP_GH
-    /* G->H */
-    int OnGhIsDnDPending(void);
-    int OnGhDropped(const RTCString &strFormat, uint32_t action);
-#endif
-
-    int ProcessEvent(PVBOXDNDEVENT pEvent);
-
-protected:
-
-    void reset(void);
-
-public: /** @todo Make protected! */
-
-    /** Pointer to DnD context. */
-    PVBOXDNDCONTEXT            pContext;
-    RTCRITSECT                 mCritSect;
-    RTSEMEVENT                 mEventSem;
-#ifdef RT_OS_WINDOWS
-    /** The window's handle. */
-    HWND                       hWnd;
-    /** List of allowed MIME types this
-     *  client can handle. Make this a per-instance
-     *  property so that we can selectively allow/forbid
-     *  certain types later on runtime. */
-    RTCList<RTCString>         lstAllowedFormats;
-    /** List of formats for the current
-     *  drag'n drop operation. */
-    RTCList<RTCString>         lstFormats;
-    /** Flags of all current drag'n drop
-     *  actions allowed. */
-    uint32_t                   uAllActions;
-    /** The startup information required
-     *  for the actual DoDragDrop() call. */
-    VBOXDNDSTARTUPINFO         startupInfo;
-    bool                       mfMouseButtonDown;
-#else
-    /** @todo */
-#endif
-
-    /** The window's own HGCM client ID. */
-    uint32_t                   mClientID;
-    Mode                       mMode;
-    State                      mState;
-    RTCString                  mFormatRequested;
-    RTCList<RTCString>         mLstFormats;
-    RTCList<RTCString>         mLstActions;
-};
 
 VBoxDnDWnd::VBoxDnDWnd(void)
     : hWnd(NULL),
       mfMouseButtonDown(false),
+#ifdef VBOX_WITH_DRAG_AND_DROP_GH
+      pDropTarget(NULL),
+#endif
       mClientID(UINT32_MAX),
       mMode(Unknown),
@@ -218 +60 @@
 {
     RT_ZERO(startupInfo);
+
+    reset();
 }
 
@@ -225 +69 @@
 
     reset();
-}
-
-int VBoxDnDWnd::DragRelease(void)
-{
-    /* Release mouse button in the guest to start the "drop"
-     * action at the current mouse cursor position. */
-    INPUT Input[1] = { 0 };
-    Input[0].type       = INPUT_MOUSE;
-    Input[0].mi.dwFlags = MOUSEEVENTF_LEFTUP;
-    SendInput(1, Input, sizeof(INPUT));
-
-    return VINF_SUCCESS;
 }
 
@@ -345 +177 @@
             LogFlowFunc(("Debug proxy window created, hWnd=0x%x\n", pThis->hWnd));
 #endif
-
         }
     }
@@ -444 +275 @@
         case WM_MOUSEMOVE:
         {
-            LogFlowThisFunc(("WM_MOUSEMOVE: mfMouseButtonDown=%RTbool, mState=%ld\n",
-                         mfMouseButtonDown, mState));
-
-            /* Dragging not started yet? Kick it off ... */
-            if (   mfMouseButtonDown
-                && (mState != Dragging))
+            LogFlowThisFunc(("WM_MOUSEMOVE: mfMouseButtonDown=%RTbool, mMode=%ld, mState=%ld\n",
+                             mfMouseButtonDown, mMode, mState));
+#ifdef DEBUG_andy
+            POINT p;
+            GetCursorPos(&p);
+            LogFlowThisFunc(("WM_MOUSEMOVE: curX=%ld, curY=%ld\n", p.x, p.y));
+#endif
+            int rc = VINF_SUCCESS;
+            if (mMode == HG) /* Host to guest. */
             {
-                mState = Dragging;
-
-#ifdef VBOX_DND_DEBUG_WND
-                /* Delay hinding the proxy window a bit when debugging, to see
-                 * whether the desired range is covered correctly. */
-                RTThreadSleep(5000);
-#endif
-                ShowWindow(hWnd, SW_HIDE);
-
-                int rc = VINF_SUCCESS;
-
-                LogFlowThisFunc(("Starting drag'n drop: uAllActions=0x%x, dwOKEffects=0x%x ...\n",
-                                 uAllActions, startupInfo.dwOKEffects));
-
-                AssertPtr(startupInfo.pDataObject);
-                AssertPtr(startupInfo.pDropSource);
-                DWORD dwEffect;
-                HRESULT hr = DoDragDrop(startupInfo.pDataObject, startupInfo.pDropSource,
-                                        startupInfo.dwOKEffects, &dwEffect);
-                LogFlowThisFunc(("rc=%Rhrc, dwEffect=%RI32\n", hr, dwEffect));
-                switch (hr)
+                /* Dragging not started yet? Kick it off ... */
+                if (   mfMouseButtonDown
+                    && (mState != Dragging))
                 {
-                    case DRAGDROP_S_DROP:
-                        mState = Dropped;
-                        break;
-
-                    case DRAGDROP_S_CANCEL:
-                        mState = Canceled;
-                        break;
-
-                    default:
-                        LogFlowThisFunc(("Drag'n drop failed with %Rhrc\n", hr));
-                        mState = Canceled;
-                        rc = VERR_GENERAL_FAILURE; /** @todo Find a better status code. */
-                        break;
+                    mState = Dragging;
+#if 0
+                    /* Delay hiding the proxy window a bit when debugging, to see
+                     * whether the desired range is covered correctly. */
+                    RTThreadSleep(5000);
+#endif
+                    hide();
+
+                    LogFlowThisFunc(("Starting drag'n drop: uAllActions=0x%x, dwOKEffects=0x%x ...\n",
+                                     uAllActions, startupInfo.dwOKEffects));
+
+                    AssertPtr(startupInfo.pDataObject);
+                    AssertPtr(startupInfo.pDropSource);
+                    DWORD dwEffect;
+                    HRESULT hr = DoDragDrop(startupInfo.pDataObject, startupInfo.pDropSource,
+                                            startupInfo.dwOKEffects, &dwEffect);
+                    LogFlowThisFunc(("rc=%Rhrc, dwEffect=%RI32\n", hr, dwEffect));
+                    switch (hr)
+                    {
+                        case DRAGDROP_S_DROP:
+                            mState = Dropped;
+                            break;
+
+                        case DRAGDROP_S_CANCEL:
+                            mState = Canceled;
+                            break;
+
+                        default:
+                            LogFlowThisFunc(("Drag'n drop failed with %Rhrc\n", hr));
+                            mState = Canceled;
+                            rc = VERR_GENERAL_FAILURE; /** @todo Find a better status code. */
+                            break;
+                    }
+
+                    int rc2 = RTCritSectEnter(&mCritSect);
+                    if (RT_SUCCESS(rc2))
+                    {
+                        startupInfo.pDropSource->Release();
+                        startupInfo.pDataObject->Release();
+
+                        RT_ZERO(startupInfo);
+
+                        rc2 = RTCritSectLeave(&mCritSect);
+                        if (RT_SUCCESS(rc))
+                            rc = rc2;
+                    }
+
+                    mMode = Unknown;
                 }
-
-                int rc2 = RTCritSectEnter(&mCritSect);
-                if (RT_SUCCESS(rc2))
-                {
-                    startupInfo.pDropSource->Release();
-                    startupInfo.pDataObject->Release();
-
-                    RT_ZERO(startupInfo);
-
-                    RTCritSectLeave(&mCritSect);
-                }
-
-                LogFlowThisFunc(("Drag'n drop resulted in mState=%ld, rc=%Rrc\n",
-                             mState, rc));
             }
-
+            else if (mMode == GH) /* Guest to host. */
+            {
+                hide();
+            }
+            else
+                rc = VERR_NOT_SUPPORTED;
+
+            LogFlowThisFunc(("WM_MOUSEMOVE: mMode=%ld, mState=%ld, rc=%Rrc\n",
+                             mMode, mState, rc));
             return 0;
         }
@@ -520 +365 @@
                 {
                     LogFlowThisFunc(("HOST_DND_HG_EVT_ENTER\n"));
+
+                    reset();
+
+                    Assert(mMode == Unknown);
+                    mMode = HG;
 
                     if (pEvent->Event.cbFormats)
@@ -540 +390 @@
                 {
                     LogFlowThisFunc(("HOST_DND_HG_EVT_MOVE: %d,%d\n",
-                                 pEvent->Event.u.a.uXpos, pEvent->Event.u.a.uYpos));
-
-                    rc = OnHgMove(pEvent->Event.u.a.uXpos, pEvent->Event.u.a.uYpos, pEvent->Event.u.a.uDefAction);
+                                     pEvent->Event.u.a.uXpos, pEvent->Event.u.a.uYpos));
+
+                    rc = OnHgMove(pEvent->Event.u.a.uXpos, pEvent->Event.u.a.uYpos,
+                                  pEvent->Event.u.a.uDefAction);
                     break;
                 }
@@ -566 +417 @@
                     LogFlowThisFunc(("HOST_DND_HG_SND_DATA\n"));
 
-                    rc = OnHgDataReceived(pEvent->Event.u.b.pvData, pEvent->Event.u.b.cbData);
+                    rc = OnHgDataReceived(pEvent->Event.u.b.pvData,
+                                          pEvent->Event.u.b.cbData);
                     break;
                 }
@@ -575 +427 @@
 
                     rc = OnHgCancel();
+
+                    reset();
                     break;
                 }
 
-#ifdef VBOX_WITH_DRAG_AND_DROP_GH
                 case DragAndDropSvc::HOST_DND_GH_REQ_PENDING:
                 {
                     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);
+#else
+                    rc = VERR_NOT_SUPPORTED;
+#endif
                     break;
                 }
@@ -589 +449 @@
                 {
                     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;
+#else
+                    rc = VERR_NOT_SUPPORTED;
+#endif
                     break;
                 }
@@ -596 +464 @@
                 {
                     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;
                 }
-#endif
+
                 default:
                     rc = VERR_NOT_SUPPORTED;
@@ -635 +508 @@
 
             LogFlowThisFunc(("Processing event %RU32 resulted in rc=%Rrc\n",
-                         pEvent->Event.uType, rc));
+                             pEvent->Event.uType, rc));
             if (pEvent)
                 RTMemFree(pEvent);
@@ -648 +521 @@
 }
 
+#ifdef VBOX_WITH_DRAG_AND_DROP_GH
+/**
+ * Registers this proxy window as a local drop target.
+ *
+ * @return  IPRT status code.
+ */
+int VBoxDnDWnd::RegisterAsDropTarget(void)
+{
+    if (pDropTarget) /* Already registered as drop target? */
+        return VINF_SUCCESS;
+
+    int rc = VBoxDnDDropTarget::CreateDropTarget(this /* pParent */,
+                                                 &pDropTarget);
+    if (RT_SUCCESS(rc))
+    {
+        AssertPtr(pDropTarget);
+        HRESULT hr = CoLockObjectExternal(pDropTarget, TRUE /* fLock */,
+                                          FALSE /* fLastUnlockReleases */);
+        if (SUCCEEDED(hr))
+            hr = RegisterDragDrop(hWnd, pDropTarget);
+
+        if (FAILED(hr))
+        {
+            LogRel(("DnD: Creating drop target failed with hr=0x%x\n", hr));
+            rc = VERR_GENERAL_FAILURE; /** @todo Find a better rc. */
+        }
+    }
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
+int VBoxDnDWnd::UnregisterAsDropTarget(void)
+{
+    if (!pDropTarget) /* No drop target? Bail out. */
+        return VINF_SUCCESS;
+
+    HRESULT hr = RevokeDragDrop(hWnd);
+    if (SUCCEEDED(hr))
+        hr = CoLockObjectExternal(pDropTarget, FALSE /* fLock */,
+                                  TRUE /* fLastUnlockReleases */);
+    if (SUCCEEDED(hr))
+        pDropTarget->Release();
+
+    int rc = SUCCEEDED(hr)
+           ? VINF_SUCCESS : VERR_GENERAL_FAILURE; /** @todo Fix this. */
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+#endif /* VBOX_WITH_DRAG_AND_DROP_GH */
+
 int VBoxDnDWnd::OnCreate(void)
 {
@@ -657 +582 @@
     }
 
-    LogFlowThisFunc(("Client ID=%RU32\n", mClientID));
+    LogFlowThisFunc(("Client ID=%RU32, rc=%Rrc\n", mClientID, rc));
     return rc;
 }
@@ -664 +589 @@
 {
     VbglR3DnDDisconnect(mClientID);
+    LogFlowThisFuncLeave();
 }
 
 int VBoxDnDWnd::OnHgEnter(const RTCList<RTCString> &lstFormats, uint32_t uAllActions)
 {
-    reset();
-
-    mState = Initialized;
-
 #ifdef DEBUG
     LogFlowThisFunc(("uActions=0x%x, lstFormats=%zu: ", uAllActions, lstFormats.size()));
@@ -740 +662 @@
     }
 
-    /*
-     * Prepare the proxy window.
-     */
+    if (RT_SUCCESS(rc))
+        rc = makeFullscreen();
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
+int VBoxDnDWnd::OnHgMove(uint32_t u32xPos, uint32_t u32yPos, uint32_t uAction)
+{
+    LogFlowThisFunc(("u32xPos=%RU32, u32yPos=%RU32, uAction=0x%x\n",
+                     u32xPos, u32yPos, uAction));
+
+    /** @todo Put this block into a function! */
+    /** @todo Multi-monitor setups? */
+    int iScreenX = GetSystemMetrics(SM_CXSCREEN) - 1;
+    int iScreenY = GetSystemMetrics(SM_CYSCREEN) - 1;
+
+    INPUT Input[1] = { 0 };
+    Input[0].type       = INPUT_MOUSE;
+    Input[0].mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_LEFTDOWN | MOUSEEVENTF_ABSOLUTE;
+    Input[0].mi.dx      = u32xPos * (65535 / iScreenX);
+    Input[0].mi.dy      = u32yPos * (65535 / iScreenY);
+    SendInput(1, Input, sizeof(INPUT));
+
+#ifdef DEBUG_andy
+    POINT p;
+    GetCursorPos(&p);
+    LogFlowThisFunc(("curX=%d, curY=%d\n", p.x, p.y));
+#endif
+
+    uint32_t uActionNotify = DND_IGNORE_ACTION;
+    int rc = RTCritSectEnter(&mCritSect);
+    if (RT_SUCCESS(rc))
+    {
+        if (   (Dragging == mState)
+            && startupInfo.pDropSource)
+            uActionNotify = startupInfo.pDropSource->GetCurrentAction();
+
+        RTCritSectLeave(&mCritSect);
+    }
+
+    if (RT_SUCCESS(rc))
+    {
+        rc = VbglR3DnDHGAcknowledgeOperation(mClientID, uActionNotify);
+        if (RT_FAILURE(rc))
+            LogFlowThisFunc(("Acknowleding operation failed with rc=%Rrc\n", rc));
+    }
+
+    LogFlowThisFunc(("Returning uActionNotify=0x%x, rc=%Rrc\n", uActionNotify, rc));
+    return rc;
+}
+
+int VBoxDnDWnd::OnHgLeave(void)
+{
+    LogFlowThisFunc(("mMode=%ld, mState=%RU32\n", mMode, mState));
+    LogRel(("DnD: Drag'n drop operation aborted\n"));
+
+    reset();
+
+    int rc = VINF_SUCCESS;
+
+    /* Post ESC to our window to officially abort the
+     * drag'n drop operation. */
+    PostMessage(hWnd, WM_KEYDOWN, VK_ESCAPE, 0 /* lParam */);
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
+int VBoxDnDWnd::OnHgDrop(void)
+{
+    LogFlowThisFunc(("mMode=%ld, mState=%RU32\n", mMode, mState));
+
+    int rc = VINF_SUCCESS;
+    if (mState == Dragging)
+    {
+        Assert(lstFormats.size() >= 1);
+
+        /** @todo What to do when multiple formats are available? */
+        mFormatRequested = lstFormats.at(0);
+
+        rc = RTCritSectEnter(&mCritSect);
+        if (RT_SUCCESS(rc))
+        {
+            if (startupInfo.pDataObject)
+                startupInfo.pDataObject->SetStatus(VBoxDnDDataObject::Dropping);
+            else
+                rc = VERR_NOT_FOUND;
+
+            RTCritSectLeave(&mCritSect);
+        }
+
+        if (RT_SUCCESS(rc))
+        {
+            LogRel(("DnD: Requesting data as '%s' ...\n", mFormatRequested.c_str()));
+            rc = VbglR3DnDHGRequestData(mClientID, mFormatRequested.c_str());
+            if (RT_FAILURE(rc))
+                LogFlowThisFunc(("Requesting data failed with rc=%Rrc\n", rc));
+        }
+    }
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
+int VBoxDnDWnd::OnHgDataReceived(const void *pvData, uint32_t cbData)
+{
+    LogFlowThisFunc(("mState=%ld, pvData=%p, cbData=%RU32\n",
+                     mState, pvData, cbData));
+
+    mState = Dropped;
+
+    int rc = VINF_SUCCESS;
+    if (pvData)
+    {
+        Assert(cbData);
+        rc = RTCritSectEnter(&mCritSect);
+        if (RT_SUCCESS(rc))
+        {
+            if (startupInfo.pDataObject)
+                rc = startupInfo.pDataObject->Signal(mFormatRequested, pvData, cbData);
+            else
+                rc = VERR_NOT_FOUND;
+
+            RTCritSectLeave(&mCritSect);
+        }
+    }
+
+    int rc2 = dragRelease();
+    if (RT_SUCCESS(rc))
+        rc = rc2;
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
+int VBoxDnDWnd::OnHgCancel(void)
+{
+    int rc = RTCritSectEnter(&mCritSect);
+    if (RT_SUCCESS(rc))
+    {
+        if (startupInfo.pDataObject)
+            startupInfo.pDataObject->Abort();
+
+        RTCritSectLeave(&mCritSect);
+    }
+
+    int rc2 = dragRelease();
+    if (RT_SUCCESS(rc))
+        rc = rc2;
+
+    return rc;
+}
+
+#ifdef VBOX_WITH_DRAG_AND_DROP_GH
+int VBoxDnDWnd::OnGhIsDnDPending(uint32_t uScreenID)
+{
+    LogFlowThisFunc(("mMode=%ld, mState=%ld, uScreenID=%RU32\n",
+                     mMode, mState, uScreenID));
+
+    if (mState == Uninitialized)
+        reset();
+
+    int rc;
+    if (mState == Initialized)
+    {
+        //rc = makeFullscreen();
+        rc = VINF_SUCCESS;
+        if (RT_SUCCESS(rc))
+            rc = RegisterAsDropTarget();
+
+        if (RT_SUCCESS(rc))
+            mState = Dragging;
+    }
+    else
+        rc = VINF_SUCCESS;
+
+    if (   RT_SUCCESS(rc)
+        && (mState == Dragging))
+    {
+        /** @todo Put this block into a function! */
+        POINT p;
+        GetCursorPos(&p);
+
+#ifdef DEBUG_andy
+        LogFlowThisFunc(("Setting cursor to curX=%d, curY=%d\n", p.x, p.y));
+#endif
+        /** @todo Multi-monitor setups? */
+        int iScreenX = GetSystemMetrics(SM_CXSCREEN) - 1;
+        int iScreenY = GetSystemMetrics(SM_CYSCREEN) - 1;
+
+        static int pos = 100;
+        pos++;
+
+        INPUT Input[1] = { 0 };
+        Input[0].type       = INPUT_MOUSE;
+        Input[0].mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_LEFTDOWN | MOUSEEVENTF_ABSOLUTE;
+        Input[0].mi.dx      = pos * (65535 / iScreenX); //p.x * (65535 / iScreenX);
+        Input[0].mi.dy      = 100 * (65535 / iScreenY); //p.y * (65535 / iScreenY);
+        SendInput(1, Input, sizeof(INPUT));
+
+#ifdef DEBUG_andy
+        CURSORINFO ci;
+        RT_ZERO(ci);
+        ci.cbSize = sizeof(ci);
+        BOOL fRc = GetCursorInfo(&ci);
+        if (fRc)
+            LogFlowThisFunc(("Cursor shown=%RTbool, cursor=0x%p, x=%d, y=%d\n",
+                             (ci.flags & CURSOR_SHOWING) ? true : false,
+                             ci.hCursor, ci.ptScreenPos.x, ci.ptScreenPos.y));
+#endif
+    }
+
+    int rc2= VbglR3DnDGHAcknowledgePending(mClientID,
+                                           DND_COPY_ACTION, DND_COPY_ACTION, "text/plain;charset=utf-8");
+    LogFlowThisFunc(("sent=%Rrc\n", rc2));
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+
+int VBoxDnDWnd::OnGhDropped(const char *pszFormats, uint32_t cbFormats,
+                            uint32_t uDefAction)
+{
+    LogFlowThisFunc(("mMode=%ld, mState=%ld, cbFormats=%RU32, uDefAction=0x%x\n",
+                     mMode, mState, cbFormats, uDefAction));
+
+    int rc;
+    if (mState == Dragging)
+    {
+    }
+    else
+        rc = VERR_WRONG_ORDER;
+
+    LogFlowFuncLeaveRC(rc);
+    return rc;
+}
+#endif /* VBOX_WITH_DRAG_AND_DROP_GH */
+
+int VBoxDnDWnd::ProcessEvent(PVBOXDNDEVENT pEvent)
+{
+    AssertPtrReturn(pEvent, VERR_INVALID_POINTER);
+
+    PostMessage(hWnd, WM_VBOXTRAY_DND_MESSAGE,
+                0 /* wParm */, (LPARAM)pEvent /* lParm */);
+
+    return VINF_SUCCESS;
+}
+
+int VBoxDnDWnd::dragRelease(void)
+{
+    /* Release mouse button in the guest to start the "drop"
+     * action at the current mouse cursor position. */
+    INPUT Input[1] = { 0 };
+    Input[0].type       = INPUT_MOUSE;
+    Input[0].mi.dwFlags = MOUSEEVENTF_LEFTUP;
+    SendInput(1, Input, sizeof(INPUT));
+
+    return VINF_SUCCESS;
+}
+
+int VBoxDnDWnd::hide(void)
+{
+    ShowWindow(hWnd, SW_HIDE);
+
+    return VINF_SUCCESS;
+}
+
+int VBoxDnDWnd::makeFullscreen(void)
+{
+    int rc = VINF_SUCCESS;
+
     RECT r;
     RT_ZERO(r);
 
-    if (RT_SUCCESS(rc))
-    {
-        HDC hDC = GetDC(NULL);
-        BOOL fRc = EnumDisplayMonitors(hDC, NULL, VBoxDnDWnd::MonitorEnumProc, (LPARAM)&r);
+    BOOL fRc;
+    HDC hDC = GetDC(NULL /* Entire screen */);
+    if (hDC)
+    {
+        fRc = EnumDisplayMonitors(hDC, NULL, VBoxDnDWnd::MonitorEnumProc,
+                                  (LPARAM)&r);
         if (!fRc)
             rc = VERR_NOT_FOUND;
         ReleaseDC(NULL, hDC);
     }
+    else
+        rc = VERR_ACCESS_DENIED;
 
     if (RT_FAILURE(rc))
@@ -772 +967 @@
     if (RT_SUCCESS(rc))
     {
-        SetWindowPos(hWnd, HWND_TOPMOST,
-                     r.left,
-                     r.top,
-                     r.right - r.left,
-                     r.bottom - r.top,
+        fRc = SetWindowPos(hWnd, HWND_TOPMOST,
+                           r.left,
+                           r.top,
+                           r.right  - r.left,
+                           r.bottom - r.top,
 #ifdef VBOX_DND_DEBUG_WND
-                     SWP_SHOWWINDOW);
+                           SWP_SHOWWINDOW);
 #else
-                     SWP_SHOWWINDOW | SWP_NOOWNERZORDER | SWP_NOREDRAW | SWP_NOACTIVATE);
-#endif
-        LogFlowFunc(("Virtual screen is %ld,%ld,%ld,%ld (%ld x %ld)\n",
-                     r.left, r.top, r.right, r.bottom,
-                     r.right - r.left, r.bottom - r.top));
+                           SWP_SHOWWINDOW | SWP_NOOWNERZORDER | SWP_NOREDRAW | SWP_NOACTIVATE);
+#endif
+        if (fRc)
+            LogFlowFunc(("Virtual screen is %ld,%ld,%ld,%ld (%ld x %ld)\n",
+                         r.left, r.top, r.right, r.bottom,
+                         r.right - r.left, r.bottom - r.top));
+        else
+        {
+            DWORD dwErr = GetLastError();
+            LogRel(("DnD: Failed to set proxy window position, rc=%Rrc\n",
+                    RTErrConvertFromWin32(dwErr)));
+        }
     }
     else
@@ -793 +995 @@
 }
 
-int VBoxDnDWnd::OnHgMove(uint32_t u32xPos, uint32_t u32yPos, uint32_t uAction)
-{
-    LogFlowThisFunc(("u32xPos=%RU32, u32yPos=%RU32, uAction=0x%x\n",
-                     u32xPos, u32yPos, uAction));
-
-    /** @todo Multi-monitor setups? */
-    int iScreenX = GetSystemMetrics(SM_CXSCREEN) - 1;
-    int iScreenY = GetSystemMetrics(SM_CYSCREEN) - 1;
-
-    INPUT Input[1] = { 0 };
-    Input[0].type       = INPUT_MOUSE;
-    Input[0].mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_LEFTDOWN | MOUSEEVENTF_ABSOLUTE;
-    Input[0].mi.dx      = u32xPos * (65535 / iScreenX);
-    Input[0].mi.dy      = u32yPos * (65535 / iScreenY);
-    SendInput(1, Input, sizeof(INPUT));
-
-#ifdef DEBUG
-    POINT p;
-    GetCursorPos(&p);
-    LogFlowThisFunc(("curX=%d, cury=%d\n", p.x, p.y));
-#endif
-
-    uint32_t uActionNotify = DND_IGNORE_ACTION;
-    int rc = RTCritSectEnter(&mCritSect);
-    if (RT_SUCCESS(rc))
-    {
-        if (   (Dragging == mState)
-            && startupInfo.pDropSource)
-            uActionNotify = startupInfo.pDropSource->GetCurrentAction();
-
-        RTCritSectLeave(&mCritSect);
-    }
-
-    if (RT_SUCCESS(rc))
-    {
-        rc = VbglR3DnDHGAcknowledgeOperation(mClientID, uActionNotify);
-        if (RT_FAILURE(rc))
-            LogFlowThisFunc(("Acknowleding operation failed with rc=%Rrc\n", rc));
-    }
-
-    LogFlowThisFunc(("Returning uActionNotify=0x%x, rc=%Rrc\n", uActionNotify, rc));
-    return rc;
-}
-
-int VBoxDnDWnd::OnHgLeave(void)
-{
-    LogFlowThisFunc(("mMode=%RU32, mState=%RU32\n", mMode, mState));
-    LogRel(("DnD: Drag'n drop operation aborted\n"));
-
-    reset();
-
-    int rc = VINF_SUCCESS;
-
-    /* Post ESC to our window to officially abort the
-     * drag'n drop operation. */
-    PostMessage(hWnd, WM_KEYDOWN, VK_ESCAPE, 0 /* lParam */);
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
-}
-
-int VBoxDnDWnd::OnHgDrop(void)
-{
-    LogFlowThisFunc(("mMode=%RU32, mState=%RU32\n", mMode, mState));
-
-    int rc = VINF_SUCCESS;
-    if (mState == Dragging)
-    {
-        Assert(lstFormats.size() >= 1);
-
-        /** @todo What to do when multiple formats are available? */
-        mFormatRequested = lstFormats.at(0);
-
-        rc = RTCritSectEnter(&mCritSect);
-        if (RT_SUCCESS(rc))
-        {
-            if (startupInfo.pDataObject)
-                startupInfo.pDataObject->SetStatus(VBoxDnDDataObject::Dropping);
-            else
-                rc = VERR_NOT_FOUND;
-
-            RTCritSectLeave(&mCritSect);
-        }
-
-        if (RT_SUCCESS(rc))
-        {
-            LogRel(("DnD: Requesting data as '%s' ...\n", mFormatRequested.c_str()));
-            rc = VbglR3DnDHGRequestData(mClientID, mFormatRequested.c_str());
-            if (RT_FAILURE(rc))
-                LogFlowThisFunc(("Requesting data failed with rc=%Rrc\n", rc));
-        }
-    }
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
-}
-
-int VBoxDnDWnd::OnHgDataReceived(const void *pvData, uint32_t cbData)
-{
-    LogFlowThisFunc(("mState=%ld, pvData=%p, cbData=%RU32\n",
-                     mState, pvData, cbData));
-
-    mState = Dropped;
-
-    int rc = VINF_SUCCESS;
-    if (pvData)
-    {
-        Assert(cbData);
-        rc = RTCritSectEnter(&mCritSect);
-        if (RT_SUCCESS(rc))
-        {
-            if (startupInfo.pDataObject)
-                rc = startupInfo.pDataObject->Signal(mFormatRequested, pvData, cbData);
-            else
-                rc = VERR_NOT_FOUND;
-
-            RTCritSectLeave(&mCritSect);
-        }
-    }
-
-    int rc2 = DragRelease();
-    if (RT_SUCCESS(rc))
-        rc = rc2;
-
-    LogFlowFuncLeaveRC(rc);
-    return rc;
-}
-
-int VBoxDnDWnd::OnHgCancel(void)
-{
-    int rc = RTCritSectEnter(&mCritSect);
-    if (RT_SUCCESS(rc))
-    {
-        if (startupInfo.pDataObject)
-            startupInfo.pDataObject->Abort();
-
-        RTCritSectLeave(&mCritSect);
-    }
-
-    int rc2 = DragRelease();
-    if (RT_SUCCESS(rc))
-        rc = rc2;
-
-    return rc;
-}
-
-#ifdef VBOX_WITH_DRAG_AND_DROP_GH
-int VBoxDnDWnd::OnGhIsDnDPending(void)
-{
-    return 0;
-}
-
-int VBoxDnDWnd::OnGhDropped(const RTCString &strFormat, uint32_t action)
-{
-    return 0;
-}
-#endif /* VBOX_WITH_DRAG_AND_DROP_GH */
-
-int VBoxDnDWnd::ProcessEvent(PVBOXDNDEVENT pEvent)
-{
-    AssertPtrReturn(pEvent, VERR_INVALID_POINTER);
-
-    PostMessage(hWnd, WM_VBOXTRAY_DND_MESSAGE,
-                0 /* wParm */, (LPARAM)pEvent /* lParm */);
-
-    return VINF_SUCCESS;
-}
-
 void VBoxDnDWnd::reset(void)
 {
-    LogFlowThisFunc(("mState=%ld\n", mState));
+    LogFlowThisFunc(("Old mState=%ld\n", mState));
 
     lstAllowedFormats.clear();
     lstFormats.clear();
     uAllActions = DND_IGNORE_ACTION;
+
+    mMode = Unknown;
+    mState = Initialized;
 }
 
@@ -1109 +1146 @@
     AssertPtr(pWnd);
 
+    /* Number of invalid messages skipped in a row. */
+    int cMsgSkippedInvalid = 0;
+
     do
     {
@@ -1127 +1167 @@
         if (RT_SUCCESS(rc))
         {
+            cMsgSkippedInvalid = 0; /* Reset skipped messages count. */
+
             LogFlowFunc(("Received new event, type=%RU32\n", pEvent->Event.uType));
 
@@ -1140 +1182 @@
         }
         else
+        {
             LogFlowFunc(("Processing next message failed with rc=%Rrc\n", rc));
+
+            /* Old(er) hosts either are broken regarding DnD support or otherwise
+             * 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)
+            {
+                LogFlowFunc(("Too many invalid/skipped messages from host, exiting ...\n"));
+                break;
+            }
+        }
 
         if (ASMAtomicReadBool(&pCtx->fShutdown))

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -18 +18 @@
 #ifndef __VBOXTRAYDND__H
 #define __VBOXTRAYDND__H
+
+#include <iprt/critsect.h>
 
 #include <iprt/cpp/mtlist.h>
@@ -130 +132 @@
 };
 
+class VBoxDnDDropTarget : public IDropTarget
+{
+public:
+
+    VBoxDnDDropTarget(VBoxDnDWnd *pThis);
+    virtual ~VBoxDnDDropTarget(void);
+
+public:
+
+    static int CreateDropTarget(VBoxDnDWnd *pParent, IDropTarget **ppDropTarget);
+
+public: /* IUnknown methods. */
+
+    STDMETHOD(QueryInterface)(REFIID iid, void ** ppvObject);
+    STDMETHOD_(ULONG, AddRef)(void);
+    STDMETHOD_(ULONG, Release)(void);
+
+public: /* IDropTarget methods. */
+
+        STDMETHOD(DragEnter)(IDataObject *pDataObject, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect);
+        STDMETHOD(DragOver)(DWORD grfKeyState, POINTL pt, DWORD *pdwEffect);
+        STDMETHOD(DragLeave)(void);
+        STDMETHOD(Drop)(IDataObject *pDataObject, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect);
+
+protected:
+
+    static DWORD GetDropEffect(DWORD grfKeyState, DWORD dwAllowedEffects);
+
+protected:
+
+    LONG mRefCount;
+    VBoxDnDWnd *mpWndParent;
+    uint32_t mClientID;
+    DWORD mdwCurEffect;
+    IDataObject *mpDataObject;
+    bool mfHasDropData;
+};
+
 class VBoxDnDEnumFormatEtc : public IEnumFORMATETC
 {
@@ -160 +200 @@
         FORMATETC * m_pFormatEtc;
 };
+
+struct VBOXDNDCONTEXT;
+class VBoxDnDWnd;
+
+/*
+ * A drag'n drop event from the host.
+ */
+typedef struct VBOXDNDEVENT
+{
+    /** The actual event data. */
+    VBGLR3DNDHGCMEVENT Event;
+
+} VBOXDNDEVENT, *PVBOXDNDEVENT;
+
+/**
+ * DnD context data.
+ */
+typedef struct VBOXDNDCONTEXT
+{
+    /** Pointer to the service environment. */
+    const VBOXSERVICEENV      *pEnv;
+    /** Shutdown indicator. */
+    bool                       fShutdown;
+    /** Thread handle for main event queue
+     *  processing. */
+    RTTHREAD                   hEvtQueue;
+    /** The DnD main event queue. */
+    RTCMTList<VBOXDNDEVENT>    lstEvtQueue;
+    /** Semaphore for waiting on main event queue
+     *  events. */
+    RTSEMEVENT                 hEvtQueueSem;
+    /** List of drag'n drop windows. At
+     *  the moment only one source is supported. */
+    RTCMTList<VBoxDnDWnd*>     lstWnd;
+
+} VBOXDNDCONTEXT, *PVBOXDNDCONTEXT;
+static VBOXDNDCONTEXT gCtx = {0};
+
+/**
+ * Everything which is required to successfully start
+ * a drag'n drop operation via DoDragDrop().
+ */
+typedef struct VBOXDNDSTARTUPINFO
+{
+    /** Our DnD data object, holding
+     *  the raw DnD data. */
+    VBoxDnDDataObject         *pDataObject;
+    /** The drop source for sending the
+     *  DnD request to a IDropTarget. */
+    VBoxDnDDropSource         *pDropSource;
+    /** The DnD effects which are wanted / allowed. */
+    DWORD                      dwOKEffects;
+
+} VBOXDNDSTARTUPINFO, *PVBOXDNDSTARTUPINFO;
+
+/**
+ * Class for handling a DnD proxy window.
+ ** @todo Unify this and VBoxClient's DragInstance!
+ */
+class VBoxDnDWnd
+{
+    /**
+     * Current state of a DnD proxy
+     * window.
+     */
+    enum State
+    {
+        Uninitialized = 0,
+        Initialized,
+        Dragging,
+        Dropped,
+        Canceled
+    };
+
+    /**
+     * Current operation mode of
+     * a DnD proxy window.
+     */
+    enum Mode
+    {
+        /** Unknown mode. */
+        Unknown = 0,
+        /** Host to guest. */
+        HG,
+        /** Guest to host. */
+        GH
+    };
+
+public:
+
+    VBoxDnDWnd(void);
+    virtual ~VBoxDnDWnd(void);
+
+public:
+
+    int Initialize(PVBOXDNDCONTEXT pContext);
+
+public:
+
+    /** The window's thread for the native message pump and
+     *  OLE context. */
+    static int Thread(RTTHREAD hThread, void *pvUser);
+
+public:
+
+    static BOOL CALLBACK MonitorEnumProc(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMonitor, LPARAM lParam);
+    /** The per-instance wndproc routine. */
+    LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+
+public:
+
+#ifdef VBOX_WITH_DRAG_AND_DROP_GH
+    int RegisterAsDropTarget(void);
+    int UnregisterAsDropTarget(void);
+#endif
+
+public:
+
+    int OnCreate(void);
+    void OnDestroy(void);
+
+    /* H->G */
+    int OnHgEnter(const RTCList<RTCString> &formats, uint32_t uAllActions);
+    int OnHgMove(uint32_t u32xPos, uint32_t u32yPos, uint32_t uAllActions);
+    int OnHgDrop(void);
+    int OnHgLeave(void);
+    int OnHgDataReceived(const void *pvData, uint32_t cData);
+    int OnHgCancel(void);
+
+#ifdef VBOX_WITH_DRAG_AND_DROP_GH
+    /* G->H */
+    int OnGhIsDnDPending(uint32_t uScreenID);
+    int OnGhDropped(const char *pszFormats, uint32_t cbFormats, uint32_t uDefAction);
+#endif
+
+    int ProcessEvent(PVBOXDNDEVENT pEvent);
+
+public:
+
+    int hide(void);
+
+protected:
+
+    int dragRelease(void);
+    int makeFullscreen(void);
+    void reset(void);
+
+public: /** @todo Make protected! */
+
+    /** Pointer to DnD context. */
+    PVBOXDNDCONTEXT            pContext;
+    RTCRITSECT                 mCritSect;
+    RTSEMEVENT                 mEventSem;
+#ifdef RT_OS_WINDOWS
+    /** The window's handle. */
+    HWND                       hWnd;
+    /** List of allowed MIME types this
+     *  client can handle. Make this a per-instance
+     *  property so that we can selectively allow/forbid
+     *  certain types later on runtime. */
+    RTCList<RTCString>         lstAllowedFormats;
+    /** List of formats for the current
+     *  drag'n drop operation. */
+    RTCList<RTCString>         lstFormats;
+    /** Flags of all current drag'n drop
+     *  actions allowed. */
+    uint32_t                   uAllActions;
+    /** The startup information required
+     *  for the actual DoDragDrop() call. */
+    VBOXDNDSTARTUPINFO         startupInfo;
+    /** Is the left mouse button being pressed
+     *  currently while being in this window? */
+    bool                       mfMouseButtonDown;
+# ifdef VBOX_WITH_DRAG_AND_DROP_GH
+    IDropTarget               *pDropTarget;
+# endif /* VBOX_WITH_DRAG_AND_DROP_GH */
+#else
+    /** @todo Implement me. */
+#endif
+
+    /** The window's own HGCM client ID. */
+    uint32_t                   mClientID;
+    /** The current operation mode. */
+    Mode                       mMode;
+    /** The current state. */
+    State                      mState;
+    RTCString                  mFormatRequested;
+    RTCList<RTCString>         mLstFormats;
+    RTCList<RTCString>         mLstActions;
+};
 #endif /* __VBOXTRAYDND__H */
 

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2013 Oracle Corporation
+ * Copyright (C) 2013-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -355 +355 @@
                     RTMemFree(pBuf);
                 }
+                else
+                    rc = VERR_NO_MEMORY;
+
+                if (RT_FAILURE(rc))
+                    hr = DV_E_FORMATETC;
             }
         }
@@ -362 +367 @@
     {
         LogFlowFunc(("Copying medium ...\n"));
-        switch(pThisMedium->tymed)
+        switch (pThisMedium->tymed)
         {
 
         case TYMED_HGLOBAL:
-            pMedium->hGlobal = (HGLOBAL)OleDuplicateData(pThisMedium->hGlobal, pThisFormat->cfFormat, NULL);
+            pMedium->hGlobal = (HGLOBAL)OleDuplicateData(pThisMedium->hGlobal,
+                                                         pThisFormat->cfFormat, NULL);
             break;
 
@@ -373 +379 @@
         }
 
-        pMedium->tymed                  = pThisFormat->tymed;
+        pMedium->tymed          = pThisFormat->tymed;
         pMedium->pUnkForRelease = NULL;
     }
@@ -569 +575 @@
                  pFormatEtc->tymed, pFormatEtc->cfFormat, VBoxDnDDataObject::ClipboardFormatToString(pFormatEtc->cfFormat),
                  pFormatEtc->dwAspect));
+
     return false;
-
 }