Changeset 100450 in vbox for trunk/src/VBox

Timestamp:

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

Author:

vboxsync

Message:

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

Location:

trunk/src/VBox

Files:

• Additions/WINNT/VBoxTray/VBoxClipboard.cpp (modified) (6 diffs)
• HostServices/SharedClipboard/VBoxSharedClipboardSvc-win.cpp (modified) (4 diffs)

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

@@ -515 +515 @@
         case WM_RENDERFORMAT: /* Guest wants to render the clipboard data. */
         {
-            LogFunc(("WM_RENDERFORMAT\n"));
-
             /* Insert the requested clipboard format data into the clipboard. */
-            const UINT cfFormat = (UINT)wParam;
-
-            const SHCLFORMAT fFormat = SharedClipboardWinClipboardFormatToVBox(cfFormat);
-
-            LogFunc(("WM_RENDERFORMAT: cfFormat=%u -> fFormat=0x%x\n", cfFormat, fFormat));
-
+            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(fFormat);
+            char *pszFmts = ShClFormatsToStrA(uFmtVBox);
             AssertPtrReturn(pszFmts, 0);
-            LogRel(("Shared Clipboard: Rendering Windows format %#x as VBox format '%s'\n", cfFormat, pszFmts));
+            LogRel(("Shared Clipboard: Rendering Windows format %#x as VBox format '%s'\n", uFmtWin, pszFmts));
             RTStrFree(pszFmts);
 #endif
-            if (fFormat == VBOX_SHCL_FMT_NONE)
+            if (uFmtVBox == VBOX_SHCL_FMT_NONE)
             {
-                LogRel(("Shared Clipboard: Unsupported format (%#x) requested\n", cfFormat));
+                LogRel(("Shared Clipboard: Unsupported format (%#x) requested\n", uFmtWin));
                 SharedClipboardWinClear();
             }
@@ -548 +544 @@
                     {
                         /* Read the host data to the preallocated buffer. */
-                        int rc = VbglR3ClipboardReadDataEx(&pCtx->CmdCtx, fFormat, pvMem, cbPrealloc, &cb);
+                        int rc = VbglR3ClipboardReadDataEx(&pCtx->CmdCtx, uFmtVBox, pvMem, cbPrealloc, &cb);
                         if (RT_SUCCESS(rc))
                         {
@@ -575 +571 @@
                                         /* Read the host data to the preallocated buffer. */
                                         uint32_t cbNew = 0;
-                                        rc = VbglR3ClipboardReadDataEx(&pCtx->CmdCtx, fFormat, pvMem, cb, &cbNew);
+                                        rc = VbglR3ClipboardReadDataEx(&pCtx->CmdCtx, uFmtVBox, pvMem, cb, &cbNew);
                                         if (   RT_SUCCESS(rc)
                                             && cbNew <= cb)
@@ -608 +604 @@
                                  * must have the exact string size.
                                  */
-                                if (fFormat == VBOX_SHCL_FMT_UNICODETEXT)
+                                if (uFmtVBox == VBOX_SHCL_FMT_UNICODETEXT)
                                 {
                                     size_t cwcActual = 0;
@@ -625 +621 @@
                                     }
                                 }
-                                else if (fFormat == VBOX_SHCL_FMT_HTML)
+                                else if (uFmtVBox == VBOX_SHCL_FMT_HTML)
                                 {
                                     /* Wrap content into CF_HTML clipboard format if needed. */
@@ -678 +674 @@
                                     /* 'hMem' contains the host clipboard data.
                                      * size is 'cb' and format is 'format'. */
-                                    HANDLE hClip = SetClipboardData(cfFormat, hMem);
+                                    HANDLE hClip = SetClipboardData(uFmtWin, hMem);
                                     if (hClip)
                                     {

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));