Changeset 86959 in vbox for trunk/src/VBox/HostServices

Timestamp:

Nov 23, 2020 11:25:53 AM (4 years ago)

Author:

vboxsync

Message:

Shared Clipboard: Convert VBox clipboard formats to strings to improve logging.

File:

• trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp (modified) (5 diffs)

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

@@ -1213 +1213 @@
         fFormats &= ~fFormat;
 
+#ifdef LOG_ENABLED
+        char *pszFmt = ShClFormatsToStrA(fFormat);
+        AssertPtrReturn(pszFmt, VERR_NO_MEMORY);
+        LogRel2(("Shared Clipboard: Requesting guest clipboard data in format '%s'\n", pszFmt));
+        RTStrFree(pszFmt);
+#endif
         /*
          * Allocate messages, one for each format.
@@ -1389 +1395 @@
     if (!(g_fTransferMode & VBOX_SHCL_TRANSFER_MODE_ENABLED))
     {
-        LogFlowFunc(("fFormats=%#x -> %#x\n", fFormats, fFormats & ~VBOX_SHCL_FMT_URI_LIST));
         fFormats &= ~VBOX_SHCL_FMT_URI_LIST;
     }
+    else
+        LogRel2(("Shared Clipboard: Warning: File transfers are disabled, ignoring\n"));
 #endif
-    LogRel2(("Shared Clipboard: Reporting formats %#x to guest\n", fFormats));
+
+#ifdef LOG_ENABLED
+    char *pszFmts = ShClFormatsToStrA(fFormats);
+    AssertPtrReturn(pszFmts, VERR_NO_MEMORY);
+    LogRel2(("Shared Clipboard: Reporting formats '%s' to guest\n", pszFmts));
+    RTStrFree(pszFmts);
+#endif
 
     /*
@@ -1508 +1521 @@
             else
             {
+#ifdef LOG_ENABLED
+                char *pszFmts = ShClFormatsToStrA(fFormats);
+                AssertPtrReturn(pszFmts, VERR_NO_MEMORY);
+                LogRel2(("Shared Clipboard: Guest reported formats '%s' to host\n", pszFmts));
+                RTStrFree(pszFmts);
+#endif
                 rc = ShClBackendFormatAnnounce(pClient, fFormats);
                 if (RT_FAILURE(rc))
@@ -1606 +1625 @@
     }
 
-    LogRel2(("Shared Clipboard: Guest wants to read %RU32 bytes host clipboard data in format %RU32\n", cbData, uFormat));
+#ifdef LOG_ENABLED
+    char *pszFmt = ShClFormatsToStrA(uFormat);
+    AssertPtrReturn(pszFmt, VERR_NO_MEMORY);
+    LogRel2(("Shared Clipboard: Guest wants to read %RU32 bytes host clipboard data in format '%s'\n", cbData, pszFmt));
+    RTStrFree(pszFmt);
+#endif
 
     /*
@@ -1796 +1820 @@
     }
 
-    LogRel2(("Shared Clipboard: Guest writes %RU32 bytes clipboard data in format %RU32 to host\n", cbData, uFormat));
+#ifdef LOG_ENABLED
+    char *pszFmt = ShClFormatsToStrA(uFormat);
+    AssertPtrReturn(pszFmt, VERR_NO_MEMORY);
+    LogRel2(("Shared Clipboard: Guest writes %RU32 bytes clipboard data in format '%s' to host\n", cbData, pszFmt));
+    RTStrFree(pszFmt);
+#endif
 
     /*