Changeset 100403 in vbox for trunk/src/VBox/GuestHost

Timestamp:

Jul 6, 2023 9:11:08 AM (20 months ago)

Author:

vboxsync

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

158143

Message:

Shared Clipboard: Windows logging tweaks, mostly for HTML <-> MIME conversion.

File:

• trunk/src/VBox/GuestHost/SharedClipboard/clipboard-win.cpp (modified) (5 diffs)

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

@@ -101 +101 @@
         const DWORD dwLastErr = GetLastError();
         rc = RTErrConvertFromWin32(dwLastErr);
-        LogRel(("Failed to open clipboard, rc=%Rrc (0x%x)\n", rc, dwLastErr));
+        LogRel(("Shared Clipboard: Failed to open clipboard, rc=%Rrc (0x%x)\n", rc, dwLastErr));
     }
 
@@ -551 +551 @@
                     else
                     {
-                        LogRelFlowFunc(("Error: Unknown CF_HTML format. Expected EndFragment. rc = %Rrc\n", rc));
+                        LogRel(("Shared Clipboard: Unknown CF_HTML format, expected EndFragment, rc=%Rrc\n", rc));
                         RTMemFree(pszResult);
                     }
                 }
                 else
-                {
-                    LogRelFlowFunc(("Error: Unknown CF_HTML format. Expected EndFragment\n"));
+
                     rc = VERR_NO_MEMORY;
-                }
             }
             else
             {
-                LogRelFlowFunc(("Error: CF_HTML out of bounds - offStart=%#x offEnd=%#x cch=%#x\n", offStart, offEnd, cch));
+                LogRel(("Shared Clipboard: Error: CF_HTML out of bounds - offStart=%#x, offEnd=%#x, cch=%#x\n", offStart, offEnd, cch));
                 rc = VERR_INVALID_PARAMETER;
             }
@@ -569 +567 @@
         else
         {
-            LogRelFlowFunc(("Error: Unknown CF_HTML format. Expected EndFragment. rc = %Rrc\n", rc));
+            LogRel(("Shared Clipboard: Error: Unknown CF_HTML format, expected EndFragment, rc=%Rrc\n", rc));
             rc = VERR_INVALID_PARAMETER;
         }
@@ -575 +573 @@
     else
     {
-        LogRelFlowFunc(("Error: Unknown CF_HTML format. Expected StartFragment. rc = %Rrc\n", rc));
+        LogRel(("Shared Clipboard: Error: Unknown CF_HTML format, expected StartFragment, rc=%Rrc\n", rc));
         rc = VERR_INVALID_PARAMETER;
     }
+
+    if (RT_FAILURE(rc))
+        LogRel(("Shared Clipboard: HTML to MIME conversion failed with %Rrc\n", rc));
 
     return rc;
@@ -625 +626 @@
     else
     {
-        LogRelFlowFunc(("Error: invalid source fragment. rc = %Rrc\n", rc));
+        LogRel2(("Shared Clipboard: Error: Invalid source fragment.for HTML MIME data, rc=%Rrc\n", rc));
         return rc;
     }