Changeset 50177 in vbox

Timestamp:

Jan 23, 2014 11:51:09 AM (11 years ago)

Author:

vboxsync

Message:

DnD/VBoxTray: Update.

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• VBoxDnD.cpp (modified) (17 diffs)
• VBoxDnD.h (modified) (4 diffs)
• VBoxDnDDropSource.cpp (modified) (2 diffs)
• VBoxDnDDropTarget.cpp (modified) (6 diffs)

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

@@ -146 +146 @@
     {
         DWORD dwExStyle = WS_EX_TOOLWINDOW | WS_EX_TRANSPARENT | WS_EX_NOACTIVATE;
-        DWORD dwStyle = WS_POPUPWINDOW;
+        DWORD dwStyle = WS_POPUP;
 #ifdef VBOX_DND_DEBUG_WND
-        dwExStyle &= ~WS_EX_TRANSPARENT;
-        dwStyle |= WS_VISIBLE | WS_OVERLAPPEDWINDOW;
+        dwExStyle &= ~WS_EX_TRANSPARENT; /* Remove transparency bit. */
+        dwStyle |= WS_VISIBLE; /* Make the window visible. */
 #endif
         pThis->hWnd =
@@ -176 +176 @@
 #else
             LogFlowFunc(("Debug proxy window created, hWnd=0x%x\n", pThis->hWnd));
+
+            /*
+             * Install some mouse tracking.
+             */
+            TRACKMOUSEEVENT me;
+            RT_ZERO(me);
+            me.cbSize    = sizeof(TRACKMOUSEEVENT);
+            me.dwFlags   = TME_HOVER | TME_LEAVE | TME_NONCLIENT;
+            me.hwndTrack = pThis->hWnd;
+            BOOL fRc = TrackMouseEvent(&me);
+            Assert(fRc);
 #endif
         }
@@ -183 +194 @@
     {
         OleInitialize(NULL);
+
+        pThis->RegisterAsDropTarget();
 
         bool fShutdown = false;
@@ -269 +282 @@
             LogFlowThisFunc(("WM_LBUTTONUP\n"));
             mfMouseButtonDown = false;
+            return 0;
+
+        case WM_MOUSELEAVE:
+            LogFlowThisFunc(("WM_MOUSELEAVE\n"));
             return 0;
 
@@ -341 +358 @@
             else if (mMode == GH) /* Guest to host. */
             {
-                hide();
+                //hide();
+
+                /* Starting here VBoxDnDDropTarget should
+                 * take over; was instantiated when registering
+                 * this proxy window as a (valid) drop target. */
             }
             else
@@ -350 +371 @@
             return 0;
         }
+
+        case WM_NCMOUSEHOVER:
+            LogFlowThisFunc(("WM_NCMOUSEHOVER\n"));
+            return 0;
+
+        case WM_NCMOUSELEAVE:
+            LogFlowThisFunc(("WM_NCMOUSELEAVE\n"));
+            return 0;
 
         case WM_VBOXTRAY_DND_MESSAGE:
@@ -532 +561 @@
         return VINF_SUCCESS;
 
-    int rc = VBoxDnDDropTarget::CreateDropTarget(this /* pParent */,
-                                                 &pDropTarget);
-    if (RT_SUCCESS(rc))
-    {
+    int rc;
+    try
+    {
+        pDropTarget = new VBoxDnDDropTarget(this /* pParent */);
         AssertPtr(pDropTarget);
         HRESULT hr = CoLockObjectExternal(pDropTarget, TRUE /* fLock */,
@@ -544 +573 @@
         if (FAILED(hr))
         {
-            LogRel(("DnD: Creating drop target failed with hr=0x%x\n", hr));
+            LogRel(("DnD: Creating drop target failed with hr=%Rhrc\n", hr));
             rc = VERR_GENERAL_FAILURE; /** @todo Find a better rc. */
         }
+        else
+            rc = VINF_SUCCESS;
+    }
+    catch (std::bad_alloc)
+    {
+        rc = VERR_NO_MEMORY;
     }
 
@@ -707 +742 @@
         rc = VbglR3DnDHGAcknowledgeOperation(mClientID, uActionNotify);
         if (RT_FAILURE(rc))
-            LogFlowThisFunc(("Acknowleding operation failed with rc=%Rrc\n", rc));
+            LogFlowThisFunc(("Acknowledging operation failed with rc=%Rrc\n", rc));
     }
 
@@ -828 +863 @@
     if (mState == Initialized)
     {
-        //rc = makeFullscreen();
-        rc = VINF_SUCCESS;
+        rc = makeFullscreen();
+        /*if (RT_SUCCESS(rc))
+            rc = RegisterAsDropTarget();*/
+
         if (RT_SUCCESS(rc))
-            rc = RegisterAsDropTarget();
-
-        if (RT_SUCCESS(rc))
+        {
+            /*
+             * We have to release the left mouse button to
+             * get into our (invisible) proxy window.
+             */
+            dragRelease();
+
+            /*
+             * Even if we just released the left mouse button
+             * we're still in the dragging state to handle our
+             * own drop target (for the host).
+             */
             mState = Dragging;
+        }
     }
     else
         rc = VINF_SUCCESS;
+
+    /**
+     * Some notes regarding guest cursor movement:
+     * - The host only sends an HOST_DND_GH_REQ_PENDING message to the guest
+     *   if the mouse cursor is outside the VM's window.
+     * - The guest does not know anything about the host's cursor
+     *   position / state due to security reasons.
+     * - The guest *only* knows that the host currently is asking whether a
+     *   guest DnD operation is in progress.
+     */
 
     if (   RT_SUCCESS(rc)
@@ -845 +902 @@
         POINT p;
         GetCursorPos(&p);
-
+        ClientToScreen(hWnd, &p);
 #ifdef DEBUG_andy
-        LogFlowThisFunc(("Setting cursor to curX=%d, curY=%d\n", p.x, p.y));
-#endif
+        LogFlowThisFunc(("Client to screen curX=%ld, curY=%ld\n", p.x, p.y));
+#endif
+
+#if 1
         /** @todo Multi-monitor setups? */
         int iScreenX = GetSystemMetrics(SM_CXSCREEN) - 1;
         int iScreenY = GetSystemMetrics(SM_CYSCREEN) - 1;
 
-        static int pos = 100;
-        pos++;
+        static LONG px = p.x;
+        if (px <= 0)
+            px = 1;
+        static LONG py = p.y;
+        if (py <= 0)
+            py = 1;
+        //px++; py++;
+        LogFlowThisFunc(("px=%ld, py=%ld\n", px, py));
 
         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));
+        Input[0].mi.dwFlags = MOUSEEVENTF_MOVE | /*MOUSEEVENTF_LEFTDOWN |*/ MOUSEEVENTF_ABSOLUTE;
+        Input[0].mi.dx      = px * (65535 / iScreenX);
+        Input[0].mi.dy      = py * (65535 / iScreenY);
+        UINT uiProcessed = SendInput(1, Input, sizeof(INPUT));
+        if (uiProcessed)
+        {
+#ifdef DEBUG_andy
+            LogFlowFunc(("Sent %RU16 mouse input(s), x=%ld, y=%ld, flags=0x%x\n",
+                         uiProcessed, Input[0].mi.dx, Input[0].mi.dy, Input[0].mi.dwFlags));
+#endif
+        }
+        else
+            LogFlowFunc(("Unable to send input, error=0x%x\n", GetLastError()));
+#else
+        SetCursorPos(p.x, p.y);
+#endif
 
 #ifdef DEBUG_andy
@@ -875 +952 @@
     }
 
-    int rc2= VbglR3DnDGHAcknowledgePending(mClientID,
-                                           DND_COPY_ACTION, DND_COPY_ACTION, "text/plain;charset=utf-8");
-    LogFlowThisFunc(("sent=%Rrc\n", rc2));
+    if (RT_SUCCESS(rc))
+    {
+        uint32_t uDefAction = DND_IGNORE_ACTION;
+        RTCString strFormat = "unknown";
+        if (   pDropTarget
+            && pDropTarget->HasData())
+        {
+            uDefAction = DND_COPY_ACTION;
+            uAllActions = uDefAction;
+            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());
+    }
 
     LogFlowFuncLeaveRC(rc);
@@ -888 +979 @@
     LogFlowThisFunc(("mMode=%ld, mState=%ld, cbFormats=%RU32, uDefAction=0x%x\n",
                      mMode, mState, cbFormats, uDefAction));
-
     int rc;
     if (mState == Dragging)
     {
+        AssertPtr(pDropTarget);
     }
     else
@@ -913 +1004 @@
 int VBoxDnDWnd::dragRelease(void)
 {
+#ifdef DEBUG_andy
+    LogFlowFunc(("\n"));
+#endif
     /* Release mouse button in the guest to start the "drop"
      * action at the current mouse cursor position. */
@@ -925 +1019 @@
 int VBoxDnDWnd::hide(void)
 {
+#ifdef DEBUG_andy
+    LogFlowFunc(("\n"));
+#endif
     ShowWindow(hWnd, SW_HIDE);
 
@@ -967 +1064 @@
     if (RT_SUCCESS(rc))
     {
+        LONG lStyle = GetWindowLong(hWnd, GWL_STYLE);
+        SetWindowLong(hWnd, GWL_STYLE,
+                      lStyle & ~(WS_CAPTION | WS_THICKFRAME));
+        LONG lExStyle = GetWindowLong(hWnd, GWL_EXSTYLE);
+        SetWindowLong(hWnd, GWL_EXSTYLE,
+                      lExStyle & ~(  WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE
+                                   | WS_EX_CLIENTEDGE | WS_EX_STATICEDGE));
+
         fRc = SetWindowPos(hWnd, HWND_TOPMOST,
                            r.left,
@@ -973 +1078 @@
                            r.bottom - r.top,
 #ifdef VBOX_DND_DEBUG_WND
-                           SWP_SHOWWINDOW);
+                           SWP_SHOWWINDOW | SWP_FRAMECHANGED);
 #else
                            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
         {

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

@@ -106 +106 @@
 public:
 
-    static int CreateDropSource(VBoxDnDWnd *pParent, IDropSource **ppDropSource);
-
-public:
-
     uint32_t GetCurrentAction(void) { return muCurAction; }
 
@@ -139 +135 @@
     virtual ~VBoxDnDDropTarget(void);
 
-public:
-
-    static int CreateDropTarget(VBoxDnDWnd *pParent, IDropTarget **ppDropTarget);
-
 public: /* IUnknown methods. */
 
@@ -159 +151 @@
 
     static DWORD GetDropEffect(DWORD grfKeyState, DWORD dwAllowedEffects);
+
+public:
+
+    const IDataObject *GetDataObject(void) { return mpDataObject; }
+    bool HasData(void) { return mfHasDropData; }
 
 protected:
@@ -374 +371 @@
     bool                       mfMouseButtonDown;
 # ifdef VBOX_WITH_DRAG_AND_DROP_GH
-    IDropTarget               *pDropTarget;
+    VBoxDnDDropTarget         *pDropTarget;
 # endif /* VBOX_WITH_DRAG_AND_DROP_GH */
 #else

trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnDDropSource.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
@@ -43 +43 @@
 
     LogFlowFunc(("rc=%Rrc, mRefCount=%RI32\n", rc, mRefCount));
-}
-
-/* static */
-int VBoxDnDDropSource::CreateDropSource(VBoxDnDWnd *pParent, IDropSource **ppDropSource)
-{
-    AssertPtrReturn(pParent, VERR_INVALID_POINTER);
-    AssertPtrReturn(ppDropSource, VERR_INVALID_POINTER);
-
-    int rc;
-    try
-    {
-        *ppDropSource = new VBoxDnDDropSource(pParent);
-        rc = VINF_SUCCESS;
-    }
-    catch(std::bad_alloc &)
-    {
-        rc = VERR_NO_MEMORY;
-    }
-
-    return rc;
 }
 

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

@@ -47 +47 @@
 }
 
-/* static */
-int VBoxDnDDropTarget::CreateDropTarget(VBoxDnDWnd *pParent, IDropTarget **ppDropTarget)
-{
-    AssertPtrReturn(pParent, VERR_INVALID_POINTER);
-    AssertPtrReturn(ppDropTarget, VERR_INVALID_POINTER);
-
-    int rc;
-    try
-    {
-        *ppDropTarget = new VBoxDnDDropTarget(pParent);
-        rc = VINF_SUCCESS;
-    }
-    catch(std::bad_alloc &)
-    {
-        rc = VERR_NO_MEMORY;
-    }
-
-    return rc;
-}
-
 /*
  * IUnknown methods.
@@ -117 +97 @@
                  mfHasDropData, pDataObject, grfKeyState, pt.x, pt.y, *pdwEffect));
 
-    FORMATETC fmtetc = { CF_HDROP, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
+    FORMATETC fmtetc = { CF_TEXT, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
 
     /* We only handle CF_HDROP in an HGLOBAL medium at the moment. */
@@ -162 +142 @@
 
 #ifdef DEBUG_andy
-    LogFlowFunc(("Returning pdwEffect=%ld\n", pdwEffect));
+    LogFlowFunc(("Returning *pdwEffect=%ld\n", *pdwEffect));
 #endif
     return S_OK;
@@ -184 +164 @@
     AssertPtrReturn(pdwEffect, E_INVALIDARG);
 
-#ifdef DEBUG_andy
+#ifdef DEBUG
     LogFlowFunc(("mfHasDropData=%RTbool, pDataObject=0x%p, grfKeyState=0x%x, x=%ld, y=%ld\n",
                  mfHasDropData, pDataObject, grfKeyState, pt.x, pt.y));
 #endif
-
-    //PositionCursor(m_hWnd, pt);
-
     bool fCanDrop = false;
     if (mfHasDropData)
     {
-        // construct a FORMATETC object
-        FORMATETC fmtetc = { CF_TEXT, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
-        STGMEDIUM stgmed;
+        FORMATETC fmtEtc = { CF_TEXT, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL };
+        STGMEDIUM stgMed;
 
         AssertPtr(pDataObject);
-        if (   (pDataObject->QueryGetData(&fmtetc) == S_OK)
-            && (pDataObject->GetData(&fmtetc, &stgmed) == S_OK))
+        if (   (pDataObject->QueryGetData(&fmtEtc)     == S_OK)
+            && (pDataObject->GetData(&fmtEtc, &stgMed) == S_OK))
         {
-            // we asked for the data as a HGLOBAL, so access it appropriately
-            PVOID data = GlobalLock(stgmed.hGlobal);
-
-            //SetWindowText(hwnd, (char *)data);
-
-            GlobalUnlock(stgmed.hGlobal);
-
-            // release the data using the COM API
-            ReleaseStgMedium(&stgmed);
+            PVOID pvData = GlobalLock(stgMed.hGlobal);
+#ifdef DEBUG
+            if (fmtEtc.cfFormat == CF_TEXT)
+                LogFlowFunc(("pvData=%s\n", (char*)pvData));
+#endif
+            GlobalUnlock(stgMed.hGlobal);
+
+            /* Release storage medium again. */
+            ReleaseStgMedium(&stgMed);
 
             fCanDrop = true;
@@ -225 +201 @@
         *pdwEffect = DROPEFFECT_NONE;
 
+    LogFlowFunc(("Returning with mfHasDropData=%RTbool, fCanDrop=%RTbool, *pdwEffect=%RI32\n",
+                 mfHasDropData, fCanDrop, *pdwEffect));
     return S_OK;
 }
@@ -251 +229 @@
 
 #ifdef DEBUG_andy
-    LogFlowFunc(("dwEffect=%ld\n", dwEffect));
+    LogFlowFunc(("grfKeyState=0x%x, dwAllowedEffects=0x%x, dwEffect=0x%x\n",
+                 grfKeyState, dwAllowedEffects, dwEffect));
 #endif
     return dwEffect;