Changeset 82507 in vbox for trunk/src

Timestamp:

Dec 9, 2019 10:12:44 AM (5 years ago)

Author:

vboxsync

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

135360

Message:

VBoxTray,VBoxClient: Use '&' rather than '==' when testing format requested in VBOX_SHCL_HOST_MSG_READ_DATA, as darwin hosts may (incorrectly) request more than one format. bugref:9437

Location:

trunk/src/VBox

Files:

• Additions/WINNT/VBoxTray/VBoxClipboard.cpp (modified) (6 diffs)
• GuestHost/SharedClipboard/clipboard-x11.cpp (modified) (4 diffs)

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

@@ -561 +561 @@
             Assert(pEvent->enmType == VBGLR3CLIPBOARDEVENTTYPE_READ_DATA);
 
-            const SHCLFORMAT uFormat = (uint32_t)pEvent->u.ReadData.uFmt;
+            const SHCLFORMAT fFormat = (uint32_t)pEvent->u.ReadData.uFmt;
 
             HANDLE hClip = NULL;
 
-            LogFlowFunc(("SHCL_WIN_WM_READ_DATA: uFormat=0x%x\n", uFormat));
+            LogFlowFunc(("SHCL_WIN_WM_READ_DATA: fFormat=%#x\n", fFormat));
 
             int rc = SharedClipboardWinOpen(hwnd);
             if (RT_SUCCESS(rc))
             {
-                if (uFormat == VBOX_SHCL_FMT_BITMAP)
+                if (fFormat & VBOX_SHCL_FMT_BITMAP)
                 {
                     hClip = GetClipboardData(CF_DIB);
@@ -579 +579 @@
                         {
                             SHCLDATABLOCK dataBlock;
-                            dataBlock.uFormat = uFormat;
+                            dataBlock.uFormat = fFormat;
                             dataBlock.pvData  = lp;
                             dataBlock.cbData  = (uint32_t)GlobalSize(hClip);
@@ -593 +593 @@
                     }
                 }
-                else if (uFormat == VBOX_SHCL_FMT_UNICODETEXT)
+                else if (fFormat & VBOX_SHCL_FMT_UNICODETEXT)
                 {
                     hClip = GetClipboardData(CF_UNICODETEXT);
@@ -602 +602 @@
                         {
                             SHCLDATABLOCK dataBlock;
-                            dataBlock.uFormat = uFormat;
+                            dataBlock.uFormat = fFormat;
                             dataBlock.pvData  = uniString;
                             dataBlock.cbData  = ((uint32_t)lstrlenW(uniString) + 1) * 2;
@@ -616 +616 @@
                     }
                 }
-                else if (uFormat == VBOX_SHCL_FMT_HTML)
+                else if (fFormat & VBOX_SHCL_FMT_HTML)
                 {
                     UINT format = RegisterClipboardFormat(SHCL_WIN_REGFMT_HTML);
@@ -629 +629 @@
                             {
                                 SHCLDATABLOCK dataBlock;
-                                dataBlock.uFormat = uFormat;
+                                dataBlock.uFormat = fFormat;
                                 dataBlock.pvData  = lp;
                                 dataBlock.cbData  = (uint32_t)GlobalSize(hClip);

trunk/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp

@@ -2260 +2260 @@
     SHCLX11CTX       *pCtx = pReq->mpCtx;
 
-    LogFlowFunc(("pReq->mFormat = %02X\n", pReq->mFormat));
+    LogFlowFunc(("pReq->mFormat = %02x\n", pReq->mFormat));
 
     int rc = VERR_NO_DATA; /* VBox thinks we have data and we don't. */
 
-    if (pReq->mFormat == VBOX_SHCL_FMT_UNICODETEXT)
+    if (pReq->mFormat & VBOX_SHCL_FMT_UNICODETEXT)
     {
         pReq->mX11Format = pCtx->X11TextFormat;
@@ -2273 +2273 @@
         }
     }
-    else if (pReq->mFormat == VBOX_SHCL_FMT_BITMAP)
+    else if (pReq->mFormat & VBOX_SHCL_FMT_BITMAP)
     {
         pReq->mX11Format = pCtx->X11BitmapFormat;
@@ -2282 +2282 @@
         }
     }
-    else if (pReq->mFormat == VBOX_SHCL_FMT_HTML)
+    else if (pReq->mFormat & VBOX_SHCL_FMT_HTML)
     {
         pReq->mX11Format = pCtx->X11HTMLFormat;
@@ -2292 +2292 @@
     }
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-    else if (pReq->mFormat == VBOX_SHCL_FMT_URI_LIST)
+    else if (pReq->mFormat & VBOX_SHCL_FMT_URI_LIST)
     {
         pReq->mX11Format = pCtx->X11URIListFormat;