Changeset 78501 in vbox for trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp

Timestamp:

May 14, 2019 11:36:25 AM (6 years ago)

Author:

vboxsync

Message:

Shared Clipboard/URI: Update.

File:

• trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp (modified) (21 diffs)

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

@@ -79 +79 @@
     const PVBOXCLIPBOARDWINCTX pWinCtx = &pCtx->Win;
 
-    LRESULT rc = 0;
+    LRESULT lresultRc = 0;
 
     switch (msg)
@@ -87 +87 @@
            if (GetClipboardOwner() != hwnd)
            {
-               Log(("WM_CLIPBOARDUPDATE\n"));
-
-               /* Clipboard was updated by another application. */
+               /* Clipboard was updated by another application.
+                * Report available formats to the host. */
                VBOXCLIPBOARDFORMATS fFormats;
-               int vboxrc = VBoxClipboardWinGetFormats(&pCtx->Win, &fFormats);
-               if (RT_SUCCESS(vboxrc))
-                   vboxrc = VbglR3ClipboardReportFormats(pCtx->u32ClientID, fFormats);
+               int rc = VBoxClipboardWinGetFormats(&pCtx->Win, &fFormats);
+               if (RT_SUCCESS(rc))
+                   rc = VbglR3ClipboardReportFormats(pCtx->u32ClientID, fFormats);
+
+               LogFunc(("WM_CLIPBOARDUPDATE: rc=%Rrc, fFormats=0x%x\n", rc, fFormats));
            }
+           else
+               LogFlowFunc(("WM_CLIPBOARDUPDATE: No change (VBoxTray is owner)\n"));
         }
         break;
@@ -102 +105 @@
            if (VBoxClipboardWinIsNewAPI(&pWinCtx->newAPI))
            {
-               rc = DefWindowProc(hwnd, msg, wParam, lParam);
+               lresultRc = DefWindowProc(hwnd, msg, wParam, lParam);
                break;
            }
@@ -123 +126 @@
                    /* Pass the message further. */
                    DWORD_PTR dwResult;
-                   rc = SendMessageTimeout(pWinCtx->hWndNextInChain, WM_CHANGECBCHAIN, wParam, lParam, 0,
-                                           VBOX_CLIPBOARD_CBCHAIN_TIMEOUT_MS, &dwResult);
-                   if (!rc)
-                       rc = (LRESULT)dwResult;
+                   lresultRc = SendMessageTimeout(pWinCtx->hWndNextInChain, WM_CHANGECBCHAIN, wParam, lParam, 0,
+                                                  VBOX_CLIPBOARD_CBCHAIN_TIMEOUT_MS, &dwResult);
+                   if (!lresultRc)
+                       lresultRc = (LRESULT)dwResult;
                }
            }
@@ -141 +144 @@
                /* WM_DRAWCLIPBOARD always expects a return code of 0, so don't change "rc" here. */
                VBOXCLIPBOARDFORMATS fFormats;
-               int vboxrc = VBoxClipboardWinGetFormats(pWinCtx, &fFormats);
-               if (RT_SUCCESS(vboxrc))
-                   vboxrc = VbglR3ClipboardReportFormats(pCtx->u32ClientID, fFormats);
+               int rc = VBoxClipboardWinGetFormats(pWinCtx, &fFormats);
+               if (RT_SUCCESS(rc))
+                   rc = VbglR3ClipboardReportFormats(pCtx->u32ClientID, fFormats);
             }
 
@@ -197 +200 @@
             LogFunc(("WM_RENDERFORMAT: cfFormat=%u -> fFormat=0x%x\n", cfFormat, fFormat));
 
-            if (fFormat != VBOX_SHARED_CLIPBOARD_FMT_NONE)
+            if (fFormat == VBOX_SHARED_CLIPBOARD_FMT_NONE)
+            {
+                LogFunc(("WM_RENDERFORMAT: Unsupported format requested\n"));
+                VBoxClipboardWinClear();
+            }
+            else
             {
                 const uint32_t cbPrealloc = _4K;
@@ -214 +222 @@
                     {
                         /* Read the host data to the preallocated buffer. */
-                        int vboxrc = VbglR3ClipboardReadData(pCtx->u32ClientID, fFormat, pMem, cbPrealloc, &cb);
-                        LogFlowFunc(("VbglR3ClipboardReadData returned with rc = %Rrc\n",  vboxrc));
-
-                        if (RT_SUCCESS(vboxrc))
+                        int rc = VbglR3ClipboardReadData(pCtx->u32ClientID, fFormat, pMem, cbPrealloc, &cb);
+                        LogFlowFunc(("VbglR3ClipboardReadData returned with rc = %Rrc\n",  rc));
+
+                        if (RT_SUCCESS(rc))
                         {
                             if (cb == 0)
@@ -245 +253 @@
                                         /* Read the host data to the preallocated buffer. */
                                         uint32_t cbNew = 0;
-                                        vboxrc = VbglR3ClipboardReadData(pCtx->u32ClientID, fFormat, pMem, cb, &cbNew);
+                                        rc = VbglR3ClipboardReadData(pCtx->u32ClientID, fFormat, pMem, cb, &cbNew);
                                         LogFlowFunc(("VbglR3ClipboardReadData returned with rc = %Rrc, cb = %d, cbNew = %d\n",
-                                                     vboxrc, cb, cbNew));
-
-                                        if (RT_SUCCESS(vboxrc)
+                                                     rc, cb, cbNew));
+
+                                        if (RT_SUCCESS(rc)
                                             && cbNew <= cb)
                                         {
@@ -335 +343 @@
             * windows is to be destroyed and therefore the guest side becomes inactive.
             */
-            int vboxrc = VBoxClipboardWinOpen(hwnd);
-            if (RT_SUCCESS(vboxrc))
+            int rc = VBoxClipboardWinOpen(hwnd);
+            if (RT_SUCCESS(rc))
             {
                VBoxClipboardWinClear();
@@ -351 +359 @@
            LogFunc(("VBOX_WM_SHCLPB_SET_FORMATS: fFormats=0x%x\n", fFormats));
 
-           int vboxrc = VBoxClipboardWinOpen(hwnd);
-           if (RT_SUCCESS(vboxrc))
+           int rc = VBoxClipboardWinOpen(hwnd);
+           if (RT_SUCCESS(rc))
            {
                VBoxClipboardWinClear();
@@ -366 +374 @@
                    hClip = SetClipboardData(CF_UNICODETEXT, NULL);
                }
-
                else if (fFormats & VBOX_SHARED_CLIPBOARD_FMT_BITMAP)
                {
@@ -372 +379 @@
                    hClip = SetClipboardData(CF_DIB, NULL);
                }
-
                else if (fFormats & VBOX_SHARED_CLIPBOARD_FMT_HTML)
                {
@@ -380 +386 @@
                        hClip = SetClipboardData(cfFormat, NULL);
                }
-
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
                else if (fFormats & VBOX_SHARED_CLIPBOARD_FMT_URI_LIST)
@@ -390 +395 @@
                        if (pWinCtx->URI.pDataObj)
                        {
-                           int vboxrc = pWinCtx->URI.pDataObj->Init(pCtx->u32ClientID);
-                           if (RT_SUCCESS(vboxrc))
+                           rc = pWinCtx->URI.pDataObj->Init(pCtx->u32ClientID);
+                           if (RT_SUCCESS(rc))
                            {
                                VBoxClipboardWinClose();
@@ -429 +434 @@
             LogFlowFunc(("VBOX_WM_SHCLPB_READ_DATA: u32Formats=0x%x\n", u32Formats));
 
-            int vboxrc = VBoxClipboardWinOpen(hwnd);
-            if (RT_SUCCESS(vboxrc))
+            int rc = VBoxClipboardWinOpen(hwnd);
+            if (RT_SUCCESS(rc))
             {
                if (u32Formats & VBOX_SHARED_CLIPBOARD_FMT_BITMAP)
                {
                    hClip = GetClipboardData(CF_DIB);
-
                    if (hClip != NULL)
                    {
@@ -441 +445 @@
                        if (lp != NULL)
                        {
-                           vboxrc = VbglR3ClipboardWriteData(pCtx->u32ClientID, VBOX_SHARED_CLIPBOARD_FMT_BITMAP,
-                                                             lp, GlobalSize(hClip));
+                           rc = VbglR3ClipboardWriteData(pCtx->u32ClientID, VBOX_SHARED_CLIPBOARD_FMT_BITMAP,
+                                                         lp, GlobalSize(hClip));
                            GlobalUnlock(hClip);
                        }
@@ -454 +458 @@
                {
                    hClip = GetClipboardData(CF_UNICODETEXT);
-
                    if (hClip != NULL)
                    {
                        LPWSTR uniString = (LPWSTR)GlobalLock(hClip);
-
                        if (uniString != NULL)
                        {
-                           vboxrc = VbglR3ClipboardWriteData(pCtx->u32ClientID, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT,
-                                                             uniString, (lstrlenW(uniString) + 1) * 2);
+                           rc = VbglR3ClipboardWriteData(pCtx->u32ClientID, VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT,
+                                                         uniString, (lstrlenW(uniString) + 1) * 2);
                            GlobalUnlock(hClip);
                        }
@@ -483 +485 @@
                            if (lp != NULL)
                            {
-                               vboxrc = VbglR3ClipboardWriteData(pCtx->u32ClientID, VBOX_SHARED_CLIPBOARD_FMT_HTML,
-                                                                 lp, GlobalSize(hClip));
+                               rc = VbglR3ClipboardWriteData(pCtx->u32ClientID, VBOX_SHARED_CLIPBOARD_FMT_HTML,
+                                                             lp, GlobalSize(hClip));
                                GlobalUnlock(hClip);
                            }
@@ -497 +499 @@
                else if (u32Formats & VBOX_SHARED_CLIPBOARD_FMT_URI_LIST)
                {
-                   UINT format = RegisterClipboardFormat(VBOX_CLIPBOARD_WIN_REGFMT_URI_LIST);
-                   if (format != 0)
+                   /* The data data in CF_HDROP format, as the files are locally present and don't need to be
+                    * presented as a IDataObject or IStream. */
+                   hClip = GetClipboardData(CF_HDROP);
+                   if (hClip)
                    {
-                       hClip = GetClipboardData(format);
-                       if (hClip)
+                       HDROP hDrop = (HDROP)GlobalLock(hClip);
+                       if (hDrop)
                        {
-                           HDROP hDrop = (HDROP)GlobalLock(hClip);
-                           if (hDrop)
-                           {
-            /*                    vboxrc = VbglR3ClipboardWriteData(pCtx->u32ClientID, VBOX_SHARED_CLIPBOARD_FMT_URI_LIST,
-                                                                 );*/
-                               GlobalUnlock(hClip);
-                           }
-                           else
-                           {
-                               hClip = NULL;
-                           }
+        /*                    vboxrc = VbglR3ClipboardWriteData(pCtx->u32ClientID, VBOX_SHARED_CLIPBOARD_FMT_URI_LIST,
+                                                             );*/
+                           GlobalUnlock(hClip);
+                       }
+                       else
+                       {
+                           hClip = NULL;
                        }
                    }
@@ -543 +543 @@
         default:
         {
-            rc = DefWindowProc(hwnd, msg, wParam, lParam);
+            lresultRc = DefWindowProc(hwnd, msg, wParam, lParam);
         }
         break;
@@ -549 +549 @@
 
 #ifndef DEBUG_andy
-    LogFlowFunc(("vboxClipboardProcessMsg returned with rc = %ld\n", rc));
+    LogFlowFunc(("vboxClipboardProcessMsg returned with lresultRc=%ld\n", lresultRc));
 #endif
-    return rc;
+    return lresultRc;
 }