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

Timestamp:

May 7, 2019 5:44:31 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

130440

Message:

Shared Clipboard/URI: Update.

Location:

trunk/src/VBox/Additions/WINNT/VBoxTray

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxClipboard.cpp (modified) (15 diffs)

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

@@ -52 +52 @@
         VBoxClipboard.cpp \
         $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/clipboard-win.cpp
+ ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
+ VBoxTray_SOURCES  += \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardURIList.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardURIObject.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardPath.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardDataObjectImpl-win.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardEnumFormatEtcImpl-win.cpp \
+        $(PATH_ROOT)/src/VBox/GuestHost/SharedClipboard/ClipboardStreamImpl-win.cpp
+ endif
 endif
 ifdef VBOX_WITH_DRAG_AND_DROP

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

@@ -174 +174 @@
         {
            /* Insert the requested clipboard format data into the clipboard. */
-           uint32_t u32Format = 0;
-           UINT format = (UINT)wParam;
-
-           LogFlowFunc(("WM_RENDERFORMAT, format = %x\n", format));
-           switch (format)
+           uint32_t fFormat = VBOX_SHARED_CLIPBOARD_FMT_NONE;
+
+           const UINT cfFormat = (UINT)wParam;
+           switch (cfFormat)
            {
               case CF_UNICODETEXT:
-                  u32Format |= VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT;
+                  fFormat = VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT;
                   break;
 
               case CF_DIB:
-                  u32Format |= VBOX_SHARED_CLIPBOARD_FMT_BITMAP;
+                  fFormat = VBOX_SHARED_CLIPBOARD_FMT_BITMAP;
                   break;
 
+#ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
+              case CF_HDROP:
+                  fFormat = VBOX_SHARED_CLIPBOARD_FMT_URI_LIST;
+                  break;
+#endif
               default:
-                  if (format >= 0xC000)
+                  if (cfFormat >= 0xC000) /** @todo r=andy Explain. */
                   {
-                      TCHAR szFormatName[256];
-
-                      int cActual = GetClipboardFormatName(format, szFormatName, sizeof(szFormatName) / sizeof(TCHAR));
+                      TCHAR szFormatName[256]; /** @todo r=andy Do we need Unicode support here as well? */
+
+                      int cActual = GetClipboardFormatName(cfFormat, szFormatName, sizeof(szFormatName) / sizeof(TCHAR));
                       if (cActual)
                       {
                           if (strcmp(szFormatName, "HTML Format") == 0)
-                          {
-                              u32Format |= VBOX_SHARED_CLIPBOARD_FMT_HTML;
-                          }
+                              fFormat = VBOX_SHARED_CLIPBOARD_FMT_HTML;
                       }
                   }
@@ -205 +207 @@
            }
 
-           if (u32Format == 0)
+           LogFunc(("WM_RENDERFORMAT: format=%u -> fFormat=0x%x\n", cfFormat, fFormat));
+
+           if (fFormat == VBOX_SHARED_CLIPBOARD_FMT_NONE)
            {
                /* Unsupported clipboard format is requested. */
-               LogFlowFunc(("Unsupported clipboard format requested: %ld\n", u32Format));
+               LogRel(("Clipboard: Unsupported clipboard format requested (0x%x)\n", fFormat));
                VBoxClipboardWinClear();
            }
+#ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
+           else if (fFormat == VBOX_SHARED_CLIPBOARD_FMT_URI_LIST)
+           {
+
+           }
+#endif
            else
            {
-               const uint32_t cbPrealloc = 4096; /** @todo r=andy Make it dynamic for supporting larger text buffers! */
+               const uint32_t cbPrealloc = _4K;
                uint32_t cb = 0;
 
@@ -228 +238 @@
                    {
                        /* Read the host data to the preallocated buffer. */
-                       int vboxrc = VbglR3ClipboardReadData(pCtx->u32ClientID, u32Format, pMem, cbPrealloc, &cb);
+                       int vboxrc = VbglR3ClipboardReadData(pCtx->u32ClientID, fFormat, pMem, cbPrealloc, &cb);
                        LogFlowFunc(("VbglR3ClipboardReadData returned with rc = %Rrc\n",  vboxrc));
 
@@ -259 +269 @@
                                        /* Read the host data to the preallocated buffer. */
                                        uint32_t cbNew = 0;
-                                       vboxrc = VbglR3ClipboardReadData(pCtx->u32ClientID, u32Format, pMem, cb, &cbNew);
+                                       vboxrc = VbglR3ClipboardReadData(pCtx->u32ClientID, fFormat, pMem, cb, &cbNew);
                                        LogFlowFunc(("VbglR3ClipboardReadData returned with rc = %Rrc, cb = %d, cbNew = %d\n", vboxrc, cb, cbNew));
 
@@ -287 +297 @@
                                 * must have the exact string size.
                                 */
-                               if (u32Format == VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
+                               if (fFormat == VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
                                {
                                    size_t cbActual = 0;
@@ -319 +329 @@
                                    /* 'hMem' contains the host clipboard data.
                                     * size is 'cb' and format is 'format'. */
-                                   HANDLE hClip = SetClipboardData(format, hMem);
+                                   HANDLE hClip = SetClipboardData(cfFormat, hMem);
                                    LogFlowFunc(("WM_RENDERFORMAT hClip = %p\n", hClip));
 
@@ -362 +372 @@
         {
            /* Announce available formats. Do not insert data, they will be inserted in WM_RENDER*. */
-           uint32_t u32Formats = (uint32_t)lParam;
-
-           LogFlowFunc(("VBOX_WM_SHCLPB_SET_FORMATS: u32Formats=0x%x\n", u32Formats));
+           VBOXCLIPBOARDFORMATS fFormats = (uint32_t)lParam;
+
+           LogFlowFunc(("VBOX_WM_SHCLPB_SET_FORMATS: fFormats=0x%x\n", fFormats));
 
            int vboxrc = VBoxClipboardWinOpen(hwnd);
@@ -373 +383 @@
                HANDLE hClip = NULL;
 
-               if (u32Formats & VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
+               if (fFormats & VBOX_SHARED_CLIPBOARD_FMT_UNICODETEXT)
                    hClip = SetClipboardData(CF_UNICODETEXT, NULL);
 
-               if (u32Formats & VBOX_SHARED_CLIPBOARD_FMT_BITMAP)
+               if (fFormats & VBOX_SHARED_CLIPBOARD_FMT_BITMAP)
                    hClip = SetClipboardData(CF_DIB, NULL);
 
-               if (u32Formats & VBOX_SHARED_CLIPBOARD_FMT_HTML)
+               if (fFormats & VBOX_SHARED_CLIPBOARD_FMT_HTML)
                {
                    UINT format = RegisterClipboardFormat("HTML Format");
@@ -387 +397 @@
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
-               if (u32Formats & VBOX_SHARED_CLIPBOARD_FMT_URI_LIST)
+               if (fFormats & VBOX_SHARED_CLIPBOARD_FMT_URI_LIST)
                    hClip = SetClipboardData(CF_HDROP, NULL);
 #endif
+
+               /** @todo Implement more flexible clipboard precedence for supported formats. */
+
+               if (hClip == NULL)
+                   LogRel(("Clipboard: Unsupported format(s) from host (0x%x), ignoring\n", fFormats));
+
                VBoxClipboardWinClose();
 
@@ -479 +495 @@
                        if (hDrop)
                        {
-                           vboxrc = VbglR3ClipboardWriteData(pCtx->u32ClientID, VBOX_SHARED_CLIPBOARD_FMT_URI_LIST,
-                                                             );
+       /*                    vboxrc = VbglR3ClipboardWriteData(pCtx->u32ClientID, VBOX_SHARED_CLIPBOARD_FMT_URI_LIST,
+                                                             );*/
                            GlobalUnlock(hClip);
                        }
@@ -681 +697 @@
                 break;
 
-            LogFlowFunc(("Error getting host message, rc=%Rrc\n", rc));
+            LogFunc(("Error getting host message, rc=%Rrc\n", rc));
 
             if (*pfShutdown)
@@ -701 +717 @@
                     * respond to WM_RENDERFORMAT message. */
                    ::PostMessage(pWinCtx->hWnd, VBOX_CLIPBOARD_WM_SET_FORMATS, 0, u32Formats);
-               }
                    break;
+               }
 
                case VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA:
@@ -708 +724 @@
                    /* The host needs data in the specified format. */
                    ::PostMessage(pWinCtx->hWnd, VBOX_CLIPBOARD_WM_READ_DATA, 0, u32Formats);
-               }
                    break;
+               }
 
                case VBOX_SHARED_CLIPBOARD_HOST_MSG_QUIT:
@@ -716 +732 @@
                    LogRel(("Clipboard: Terminating ...\n"));
                    ASMAtomicXchgBool(pfShutdown, true);
-               }
                    break;
+               }
 
                default:
@@ -725 +741 @@
                    /* Wait a bit before retrying. */
                    RTThreadSleep(1000);
-               }
                    break;
+               }
             }
         }