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

Timestamp:

May 25, 2023 8:45:54 AM (22 months ago)

Author:

vboxsync

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

157628

Message:

Shared Clipboard/HostService: Emphasize that VBOX_SHCL_TRANSFER_MODE actually is a flag and not just a number (-> VBOX_SHCL_TRANSFER_MODE_F_XXX). bugref:9437

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• VBoxSharedClipboardSvc-transfers.cpp (modified) (1 diff)
• VBoxSharedClipboardSvc.cpp (modified) (3 diffs)
• testcase/tstClipboardMockHGCM.cpp (modified) (1 diff)
• testcase/tstClipboardServiceHost.cpp (modified) (1 diff)

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

@@ -2050 +2050 @@
 int shClSvcTransferModeSet(uint32_t fMode)
 {
-    if (fMode & ~VBOX_SHCL_TRANSFER_MODE_VALID_MASK)
+    if (fMode & ~VBOX_SHCL_TRANSFER_MODE_F_VALID_MASK)
         return VERR_INVALID_FLAGS;
 
     g_fTransferMode = fMode;
 
-#ifdef DEBUG_andy
-g_fTransferMode = VBOX_SHCL_TRANSFER_MODE_ENABLED;
-#endif
-
     LogRel2(("Shared Clipboard: File transfers are now %s\n",
-             g_fTransferMode != VBOX_SHCL_TRANSFER_MODE_DISABLED ? "enabled" : "disabled"));
+             g_fTransferMode & VBOX_SHCL_TRANSFER_MODE_F_ENABLED ? "enabled" : "disabled"));
 
     /* If file transfers are being disabled, make sure to also reset (destroy) all pending transfers. */
-    if (g_fTransferMode == VBOX_SHCL_TRANSFER_MODE_DISABLED)
+    if (!(g_fTransferMode & VBOX_SHCL_TRANSFER_MODE_F_ENABLED))
     {
         ClipboardClientMap::const_iterator itClient = g_mapClients.begin();

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

@@ -262 +262 @@
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
 /** Global Shared Clipboard (file) transfer mode. */
-uint32_t g_fTransferMode = VBOX_SHCL_TRANSFER_MODE_DISABLED;
+uint32_t g_fTransferMode = VBOX_SHCL_TRANSFER_MODE_F_NONE;
 #endif
 
@@ -1448 +1448 @@
      * If transfer mode is set to disabled, don't report the URI list format to the guest.
      */
-    if (!(g_fTransferMode & VBOX_SHCL_TRANSFER_MODE_ENABLED))
+    if (!(g_fTransferMode & VBOX_SHCL_TRANSFER_MODE_F_ENABLED))
     {
         fFormats &= ~VBOX_SHCL_FMT_URI_LIST;
@@ -2225 +2225 @@
                 && (pClient->State.fGuestFeatures0 &  VBOX_SHCL_GF_0_CONTEXT_ID) )
             {
-                if (g_fTransferMode & VBOX_SHCL_TRANSFER_MODE_ENABLED)
+                if (g_fTransferMode & VBOX_SHCL_TRANSFER_MODE_F_ENABLED)
                     rc = shClSvcTransferHandler(pClient, callHandle, u32Function, cParms, paParms, tsArrival);
                 else

trunk/src/VBox/HostServices/SharedClipboard/testcase/tstClipboardMockHGCM.cpp

@@ -220 +220 @@
 
     /* Enable transfers. */
-    HGCMSvcSetU32(&parms[0], VBOX_SHCL_TRANSFER_MODE_ENABLED);
+    HGCMSvcSetU32(&parms[0], VBOX_SHCL_TRANSFER_MODE_F_ENABLED);
     rc = TstHgcmMockSvcHostCall(pSvc, NULL, VBOX_SHCL_HOST_FN_SET_TRANSFER_MODE, 1, parms);
     RTTESTI_CHECK_RC(rc, VINF_SUCCESS);
 
     /* Disable transfers again. */
-    HGCMSvcSetU32(&parms[0], VBOX_SHCL_TRANSFER_MODE_DISABLED);
+    HGCMSvcSetU32(&parms[0], VBOX_SHCL_TRANSFER_MODE_F_NONE);
     rc = TstHgcmMockSvcHostCall(pSvc, NULL, VBOX_SHCL_HOST_FN_SET_TRANSFER_MODE, 1, parms);
     RTTESTI_CHECK_RC(rc, VINF_SUCCESS);

trunk/src/VBox/HostServices/SharedClipboard/testcase/tstClipboardServiceHost.cpp

@@ -126 +126 @@
 
     /* Enable transfers. */
-    HGCMSvcSetU32(&parms[0], VBOX_SHCL_TRANSFER_MODE_ENABLED);
+    HGCMSvcSetU32(&parms[0], VBOX_SHCL_TRANSFER_MODE_F_ENABLED);
     rc = table.pfnHostCall(NULL, VBOX_SHCL_HOST_FN_SET_TRANSFER_MODE, 1, parms);
     RTTESTI_CHECK_RC(rc, VINF_SUCCESS);
 
     /* Disable transfers again. */
-    HGCMSvcSetU32(&parms[0], VBOX_SHCL_TRANSFER_MODE_DISABLED);
+    HGCMSvcSetU32(&parms[0], VBOX_SHCL_TRANSFER_MODE_F_NONE);
     rc = table.pfnHostCall(NULL, VBOX_SHCL_HOST_FN_SET_TRANSFER_MODE, 1, parms);
     RTTESTI_CHECK_RC(rc, VINF_SUCCESS);