Changeset 80623 in vbox for trunk/src/VBox/Additions

Timestamp:

Sep 6, 2019 10:05:11 AM (6 years ago)

Author:

vboxsync

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

133152

Message:

Shared Clipboard: Removed old protocol handling cruft on the host side and added message translation support for serving older Guest Additions. Updated docs / protocol changelog.

Location:

trunk/src/VBox/Additions

Files:

• WINNT/VBoxTray/VBoxClipboard.cpp (modified) (4 diffs)
• common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp (modified) (4 diffs)
• common/VBoxService/VBoxServiceClipboard-os2.cpp (modified) (2 diffs)
• haiku/VBoxTray/VBoxClipboard.cpp (modified) (1 diff)
• x11/VBoxClient/clipboard.cpp (modified) (3 diffs)

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

@@ -702 +702 @@
            HANDLE hClip = NULL;
 
-           LogFlowFunc(("VBOX_WM_SHCLPB_READ_DATA: uFormat=0x%x\n", uFormat));
+           LogFlowFunc(("VBOX_CLIPBOARD_WM_READ_DATA: uFormat=0x%x\n", uFormat));
 
            int rc = VBoxClipboardWinOpen(hwnd);
@@ -844 +844 @@
 
                    if (RT_FAILURE(rc))
-                       LogFunc(("Failed with rc=%Rrc\n", rc));
+                       LogFunc(("VBOX_CLIPBOARD_WM_READ_DATA: Failed with rc=%Rrc\n", rc));
                }
 #endif
@@ -850 +850 @@
                if (hClip == NULL)
                {
-                   LogFunc(("VBOX_WM_SHCLPB_READ_DATA: hClip=NULL, lastError=%ld\n", GetLastError()));
+                   LogFunc(("VBOX_CLIPBOARD_WM_READ_DATA: hClip=NULL, lastError=%ld\n", GetLastError()));
 
                    /* Requested clipboard format is not available, send empty data. */
@@ -1222 +1222 @@
                 switch (uMsg)
                 {
-                    case VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS_WRITE:
+                    case VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS_REPORT:
                     {
                         pEvent->enmType = VBGLR3CLIPBOARDEVENTTYPE_REPORT_FORMATS;

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp

@@ -168 +168 @@
                            VBOX_SHARED_CLIPBOARD_GUEST_FN_MSG_GET, 3);
 
-        Msg.uContext.SetUInt32(VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS_WRITE);
+        Msg.uContext.SetUInt32(VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS_REPORT);
         Msg.uFormats.SetUInt32(0);
         Msg.fFlags.SetUInt32(0);
@@ -1477 +1477 @@
         switch (uMsg)
         {
-            case VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS_WRITE:
+            case VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS_REPORT:
             {
                 rc = VbglR3ClipboardFormatsWriteRecv(&pEvent->cmdCtx, &pEvent->u.ReportFormats);
@@ -1649 +1649 @@
     if (pCtx->uProtocolVer == 0)
     {
-        VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, VBOX_SHARED_CLIPBOARD_GUEST_FN_FORMATS_WRITE, 1);
+        VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, VBOX_SHARED_CLIPBOARD_GUEST_FN_FORMATS_REPORT, 1);
         VbglHGCMParmUInt32Set(&Msg.uFormats, pFormats->uFormats);
     }
     else
     {
-        VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, VBOX_SHARED_CLIPBOARD_GUEST_FN_FORMATS_WRITE, 3);
+        VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, VBOX_SHARED_CLIPBOARD_GUEST_FN_FORMATS_REPORT, 3);
 
         Msg.uContext.SetUInt32(pCtx->uContextID);
@@ -1680 +1680 @@
     VBoxClipboardFormatsMsg Msg;
 
-    VBGL_HGCM_HDR_INIT(&Msg.hdr, idClient, VBOX_SHARED_CLIPBOARD_GUEST_FN_FORMATS_WRITE, 1);
+    VBGL_HGCM_HDR_INIT(&Msg.hdr, idClient, VBOX_SHARED_CLIPBOARD_GUEST_FN_FORMATS_REPORT, 1);
     VbglHGCMParmUInt32Set(&Msg.uFormats, fFormats);
 

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

@@ -775 +775 @@
          * Listener message - the host has new formats to offer.
          */
-        case WM_USER + VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS_WRITE:
+        case WM_USER + VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS_REPORT:
             vgsvcClipboardOs2AdvertiseHostFormats(LONGFROMMP(mp1));
             break;
@@ -895 +895 @@
                          * respond do WM_RENDERFORMAT message.
                          */
-                        case VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS_WRITE:
-                            if (!WinPostMsg(g_hwndWorker, WM_USER + VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS_WRITE,
+                        case VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS_REPORT:
+                            if (!WinPostMsg(g_hwndWorker, WM_USER + VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS_REPORT,
                                             MPFROMLONG(fFormats), 0))
                                 VGSvcError("WinPostMsg(%lx, FORMATS,,) failed, lasterr=%#lx\n",

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

@@ -380 +380 @@
             switch (u32Msg)
             {
-                case VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS_WRITE:
+                case VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS_REPORT:
                 {
                     /*

trunk/src/VBox/Additions/x11/VBoxClient/clipboard.cpp

@@ -166 +166 @@
  * @param  cb        the size of the data in @a pv
  */
-void ClipCompleteDataRequestFromX11(VBOXCLIPBOARDCONTEXT *pCtx, int rc, CLIPREADCBREQ *pReq, void *pv, uint32_t cb)
+void ClipRequestFromX11CompleteCallback(VBOXCLIPBOARDCONTEXT *pCtx, int rc, CLIPREADCBREQ *pReq, void *pv, uint32_t cb)
 {
     RT_NOREF1(pCtx);
@@ -192 +192 @@
         rc = VERR_NO_MEMORY;
     if (RT_SUCCESS(rc))
-        rc = ClipStartX11(g_ctx.pBackend);
+        rc = ClipStartX11(g_ctx.pBackend, false /* grab */);
     if (RT_SUCCESS(rc))
     {
@@ -229 +229 @@
             switch (Msg)
             {
-                case VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS_WRITE:
+                case VBOX_SHARED_CLIPBOARD_HOST_MSG_FORMATS_REPORT:
                 {
                     /* The host has announced available clipboard formats.