Changeset 100450 in vbox for trunk/src/VBox/HostServices/SharedClipboard

Timestamp:

Jul 10, 2023 11:03:30 AM (20 months ago)

Author:

vboxsync

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

158194

Message:

Shared Clipboard: Emphasize which format is which in the Windows WM_RENDERFORMAT handling code. ​​bugref:9437

File:

• trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp (modified) (4 diffs)

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp

@@ -496 +496 @@
         case WM_RENDERFORMAT:
         {
-            LogFunc(("WM_RENDERFORMAT\n"));
-
             /* Insert the requested clipboard format data into the clipboard. */
-            const UINT       uFormat = (UINT)wParam;
-            const SHCLFORMAT fFormat = SharedClipboardWinClipboardFormatToVBox(uFormat);
-            LogFunc(("WM_RENDERFORMAT: uFormat=%u -> fFormat=0x%x\n", uFormat, fFormat));
-
-            if (   fFormat       == VBOX_SHCL_FMT_NONE
+            const UINT       uFmtWin  = (UINT)wParam;
+            const SHCLFORMAT uFmtVBox = SharedClipboardWinClipboardFormatToVBox(uFmtWin);
+
+            LogFunc(("WM_RENDERFORMAT: uFmtWin=%u -> uFmtVBox=0x%x\n", uFmtWin, uFmtVBox));
+#ifdef LOG_ENABLED
+            char *pszFmts = ShClFormatsToStrA(uFmtVBox);
+            AssertPtrReturn(pszFmts, 0);
+            LogRel(("Shared Clipboard: Rendering Windows format %#x as VBox format '%s'\n", uFmtWin, pszFmts));
+            RTStrFree(pszFmts);
+#endif
+            if (   uFmtVBox      == VBOX_SHCL_FMT_NONE
                 || pCtx->pClient == NULL)
             {
@@ -514 +518 @@
                 void    *pvData = NULL;
                 uint32_t cbData = 0;
-                int rc = ShClSvcReadDataFromGuest(pCtx->pClient, uFormat, &pvData, &cbData);
+                int rc = ShClSvcReadDataFromGuest(pCtx->pClient, uFmtVBox, &pvData, &cbData);
                 if (   RT_SUCCESS(rc)
                     && pvData
@@ -520 +524 @@
                 {
                     /* Wrap HTML clipboard content info CF_HTML format if needed. */
-                    if (fFormat == VBOX_SHCL_FMT_HTML
+                    if (uFmtVBox == VBOX_SHCL_FMT_HTML
                         && !SharedClipboardWinIsCFHTML((char *)pvData))
                     {
@@ -537 +541 @@
                     }
 
-                    rc = SharedClipboardWinDataWrite(uFormat, pvData, cbData);
+                    rc = SharedClipboardWinDataWrite(uFmtWin, pvData, cbData);
                     if (RT_FAILURE(rc))
                         LogRel(("Shared Clipboard: Setting clipboard data for Windows host failed with %Rrc\n", rc));