Changeset 80374 in vbox for trunk/src/VBox/HostServices/SharedClipboard

Timestamp:

Aug 21, 2019 3:04:54 PM (6 years ago)

Author:

vboxsync

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

132839

Message:

Shared Clipboard/URI: Update.

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• VBoxSharedClipboardSvc-uri.cpp (modified) (2 diffs)
• VBoxSharedClipboardSvc-utils.cpp (modified) (1 diff)
• VBoxSharedClipboardSvc-win.cpp (modified) (5 diffs)
• VBoxSharedClipboardSvc.cpp (modified) (2 diffs)

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

@@ -1326 +1326 @@
                 SharedClipboardURICtxTransfersCleanup(&pClientData->URI);
 
-                SHAREDCLIPBOARDURITRANSFERDIR enmDir = SHAREDCLIPBOARDURITRANSFERDIR_READ;
+                const SHAREDCLIPBOARDURITRANSFERDIR enmDir = SHAREDCLIPBOARDURITRANSFERDIR_READ;
 
                 PSHAREDCLIPBOARDURITRANSFER pTransfer;
@@ -1341 +1341 @@
                         creationCtx.enmSource = pClientData->State.enmSource;
 
-                        RT_ZERO(creationCtx.Interface);
                         creationCtx.Interface.pfnTransferOpen  = vboxSvcClipboardURITransferOpen;
                         creationCtx.Interface.pfnTransferClose = vboxSvcClipboardURITransferClose;

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

@@ -102 +102 @@
         case VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_TRANSFER_START:
         {
+            Assert(pClientData->State.URI.fTransferStart == false);
+
             LogFlowFunc(("VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_TRANSFER_START\n"));
 

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

@@ -166 +166 @@
                 /* Clipboard was updated by another application, retrieve formats and report back. */
                 int rc = vboxClipboardSvcWinSyncInternal(pCtx);
-                AssertRC(rc);
-
-                vboxSvcClipboardSetSource(pCtx->pClientData, SHAREDCLIPBOARDSOURCE_LOCAL);
+                if (RT_SUCCESS(rc))
+                    vboxSvcClipboardSetSource(pCtx->pClientData, SHAREDCLIPBOARDSOURCE_LOCAL);
             }
         } break;
@@ -295 +294 @@
         } break;
 
-        case VBOX_CLIPBOARD_WM_SET_FORMATS:
-        {
-            LogFunc(("VBOX_CLIPBOARD_WM_SET_FORMATS\n"));
+        case VBOX_CLIPBOARD_WM_REPORT_FORMATS:
+        {
+            LogFunc(("VBOX_CLIPBOARD_WM_REPORT_FORMATS\n"));
 
             if (   pCtx->pClientData == NULL
@@ -305 +304 @@
                  * because host clipboard has more priority.
                  */
-                LogFunc(("VBOX_CLIPBOARD_WM_SET_FORMATS ignored; pClientData=%p\n", pCtx->pClientData));
+                LogFunc(("VBOX_CLIPBOARD_WM_REPORT_FORMATS ignored; pClientData=%p\n", pCtx->pClientData));
                 break;
             }
@@ -351 +350 @@
                     LogFunc(("Failed with rc=%Rrc\n", rc));
             }
-            LogFunc(("VBOX_CLIPBOARD_WM_SET_FORMATS: fFormats=0x%x, lastErr=%ld\n", fFormats, GetLastError()));
+            LogFunc(("VBOX_CLIPBOARD_WM_REPORT_FORMATS: fFormats=0x%x, lastErr=%ld\n", fFormats, GetLastError()));
         } break;
 
@@ -689 +688 @@
      * The guest announced formats. Forward to the window thread.
      */
-    PostMessage(pCtx->Win.hWnd, VBOX_CLIPBOARD_WM_SET_FORMATS,
+    PostMessage(pCtx->Win.hWnd, VBOX_CLIPBOARD_WM_REPORT_FORMATS,
                 0 /* wParam */, u32Formats /* lParam */);
 

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

@@ -1183 +1183 @@
                             if (u32Formats & VBOX_SHARED_CLIPBOARD_FMT_URI_LIST)
                             {
-                                /* Tell the guest that we want to start a (reading) transfer. */
+                                /* Tell the guest that we want to start a reading transfer
+                                 * (from guest to the host). */
                                 rc = vboxSvcClipboardReportMsg(pClientData, VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_TRANSFER_START,
                                                                0 /* u32Formats == 0 means reading data */);
@@ -1293 +1294 @@
                     else
                     {
-#endif
+#endif /* VBOX_WITH_SHARED_CLIPBOARD_URI_LIST */
                         void    *pv;
                         uint32_t cb;