Changeset 82514 in vbox

Timestamp:

Dec 9, 2019 1:26:25 PM (5 years ago)

Author:

vboxsync

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

135367

Message:

SharedClipboardSvc,Vbgl: Reviewed and adjusted the handling of the VBOX_SHCL_GUEST_FN_REPORT_FORMATS message, paddling back the parameter changes from the 6.1 dev cycle and fixing a couple of bugs introduced. Also documented the message and renamed it to a more sensible name. Dropped the new Vbgl method, renaming the old one. [fixes] bugref:9437

Location:

trunk/src/VBox/Additions

Files:

• common/VBoxService/VBoxServiceClipboard-os2.cpp (modified) (3 diffs)
• darwin/VBoxClient/VBoxClientClipboard.cpp (modified) (2 diffs)
• haiku/VBoxTray/VBoxClipboard.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp

@@ -611 +611 @@
     }
     VGSvcVerbose(4, "clipboard: reporting fFormats=%#x\n", fFormats);
-    VbglR3ClipboardFormatsReport(g_u32ClientId, fFormats);
+    VbglR3ClipboardReportFormats(g_u32ClientId, fFormats);
 }
 
@@ -658 +658 @@
                 g_fEmptyClipboard = true;
                 VGSvcVerbose(3, "Reporting empty clipboard\n");
-                VbglR3ClipboardFormatsReport(g_u32ClientId, 0);
+                VbglR3ClipboardReportFormats(g_u32ClientId, 0);
             }
         }
@@ -681 +681 @@
     g_fEmptyClipboard = true;
     VGSvcVerbose(3, "Reporting empty clipboard\n");
-    VbglR3ClipboardFormatsReport(g_u32ClientId, 0);
+    VbglR3ClipboardReportFormats(g_u32ClientId, 0);
 
     vgsvcClipboardOs2PollViewer();

trunk/src/VBox/Additions/darwin/VBoxClient/VBoxClientClipboard.cpp

@@ -177 +177 @@
         {
             fFormats = vbclClipboardGetAvailableFormats(g_PasteboardRef);
-            rc = VbglR3ClipboardFormatsReport(g_u32ClientId, fFormats);
+            rc = VbglR3ClipboardReportFormats(g_u32ClientId, fFormats);
             if (RT_FAILURE(rc))
             {
@@ -287 +287 @@
     AssertReturn(g_u32ClientId != 0, VERR_GENERAL_FAILURE);
 
-    VbglR3ClipboardFormatsReport(g_u32ClientId, 0);
+    VbglR3ClipboardReportFormats(g_u32ClientId, 0);
 
     rc = VbglR3ClipboardDisconnect(g_u32ClientId);

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

@@ -345 +345 @@
             be_clipboard->Unlock();
 
-            VbglR3ClipboardFormatsReport(fClientId, formats);
+            VbglR3ClipboardReportFormats(fClientId, formats);
             break;
         }