Changeset 99968 in vbox
- Timestamp:
- May 25, 2023 8:45:54 AM (17 months ago)
- Location:
- trunk
- Files:
-
- 5 edited
-
include/VBox/HostServices/VBoxClipboardSvc.h (modified) (1 diff)
-
src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-transfers.cpp (modified) (1 diff)
-
src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp (modified) (3 diffs)
-
src/VBox/HostServices/SharedClipboard/testcase/tstClipboardMockHGCM.cpp (modified) (1 diff)
-
src/VBox/HostServices/SharedClipboard/testcase/tstClipboardServiceHost.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/VBox/HostServices/VBoxClipboardSvc.h
r98103 r99968 72 72 /** @} */ 73 73 74 /** @name VBOX_SHCL_TRANSFER_MODE_XXX - The Shared Clipboard file transfer mode (bit field).74 /** @name VBOX_SHCL_TRANSFER_MODE_XXX - The Shared Clipboard file transfer mode flags. 75 75 * @{ 76 76 */ 77 77 /** Shared Clipboard file transfers are disabled. */ 78 #define VBOX_SHCL_TRANSFER_MODE_ DISABLEDUINT32_C(0)78 #define VBOX_SHCL_TRANSFER_MODE_F_NONE UINT32_C(0) 79 79 /** Shared Clipboard file transfers are enabled. */ 80 #define VBOX_SHCL_TRANSFER_MODE_ ENABLED RT_BIT(0)80 #define VBOX_SHCL_TRANSFER_MODE_F_ENABLED RT_BIT(0) 81 81 /** Shared Clipboard file transfer mode valid mask. */ 82 #define VBOX_SHCL_TRANSFER_MODE_ VALID_MASK UINT32_C(0x1)82 #define VBOX_SHCL_TRANSFER_MODE_F_VALID_MASK UINT32_C(0x1) 83 83 /** @} */ 84 84 -
trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-transfers.cpp
r99954 r99968 2050 2050 int shClSvcTransferModeSet(uint32_t fMode) 2051 2051 { 2052 if (fMode & ~VBOX_SHCL_TRANSFER_MODE_ VALID_MASK)2052 if (fMode & ~VBOX_SHCL_TRANSFER_MODE_F_VALID_MASK) 2053 2053 return VERR_INVALID_FLAGS; 2054 2054 2055 2055 g_fTransferMode = fMode; 2056 2056 2057 #ifdef DEBUG_andy2058 g_fTransferMode = VBOX_SHCL_TRANSFER_MODE_ENABLED;2059 #endif2060 2061 2057 LogRel2(("Shared Clipboard: File transfers are now %s\n", 2062 g_fTransferMode != VBOX_SHCL_TRANSFER_MODE_DISABLED ? "enabled" : "disabled"));2058 g_fTransferMode & VBOX_SHCL_TRANSFER_MODE_F_ENABLED ? "enabled" : "disabled")); 2063 2059 2064 2060 /* If file transfers are being disabled, make sure to also reset (destroy) all pending transfers. */ 2065 if ( g_fTransferMode == VBOX_SHCL_TRANSFER_MODE_DISABLED)2061 if (!(g_fTransferMode & VBOX_SHCL_TRANSFER_MODE_F_ENABLED)) 2066 2062 { 2067 2063 ClipboardClientMap::const_iterator itClient = g_mapClients.begin(); -
trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp
r99775 r99968 262 262 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS 263 263 /** Global Shared Clipboard (file) transfer mode. */ 264 uint32_t g_fTransferMode = VBOX_SHCL_TRANSFER_MODE_ DISABLED;264 uint32_t g_fTransferMode = VBOX_SHCL_TRANSFER_MODE_F_NONE; 265 265 #endif 266 266 … … 1448 1448 * If transfer mode is set to disabled, don't report the URI list format to the guest. 1449 1449 */ 1450 if (!(g_fTransferMode & VBOX_SHCL_TRANSFER_MODE_ ENABLED))1450 if (!(g_fTransferMode & VBOX_SHCL_TRANSFER_MODE_F_ENABLED)) 1451 1451 { 1452 1452 fFormats &= ~VBOX_SHCL_FMT_URI_LIST; … … 2225 2225 && (pClient->State.fGuestFeatures0 & VBOX_SHCL_GF_0_CONTEXT_ID) ) 2226 2226 { 2227 if (g_fTransferMode & VBOX_SHCL_TRANSFER_MODE_ ENABLED)2227 if (g_fTransferMode & VBOX_SHCL_TRANSFER_MODE_F_ENABLED) 2228 2228 rc = shClSvcTransferHandler(pClient, callHandle, u32Function, cParms, paParms, tsArrival); 2229 2229 else -
trunk/src/VBox/HostServices/SharedClipboard/testcase/tstClipboardMockHGCM.cpp
r98578 r99968 220 220 221 221 /* Enable transfers. */ 222 HGCMSvcSetU32(&parms[0], VBOX_SHCL_TRANSFER_MODE_ ENABLED);222 HGCMSvcSetU32(&parms[0], VBOX_SHCL_TRANSFER_MODE_F_ENABLED); 223 223 rc = TstHgcmMockSvcHostCall(pSvc, NULL, VBOX_SHCL_HOST_FN_SET_TRANSFER_MODE, 1, parms); 224 224 RTTESTI_CHECK_RC(rc, VINF_SUCCESS); 225 225 226 226 /* Disable transfers again. */ 227 HGCMSvcSetU32(&parms[0], VBOX_SHCL_TRANSFER_MODE_ DISABLED);227 HGCMSvcSetU32(&parms[0], VBOX_SHCL_TRANSFER_MODE_F_NONE); 228 228 rc = TstHgcmMockSvcHostCall(pSvc, NULL, VBOX_SHCL_HOST_FN_SET_TRANSFER_MODE, 1, parms); 229 229 RTTESTI_CHECK_RC(rc, VINF_SUCCESS); -
trunk/src/VBox/HostServices/SharedClipboard/testcase/tstClipboardServiceHost.cpp
r98103 r99968 126 126 127 127 /* Enable transfers. */ 128 HGCMSvcSetU32(&parms[0], VBOX_SHCL_TRANSFER_MODE_ ENABLED);128 HGCMSvcSetU32(&parms[0], VBOX_SHCL_TRANSFER_MODE_F_ENABLED); 129 129 rc = table.pfnHostCall(NULL, VBOX_SHCL_HOST_FN_SET_TRANSFER_MODE, 1, parms); 130 130 RTTESTI_CHECK_RC(rc, VINF_SUCCESS); 131 131 132 132 /* Disable transfers again. */ 133 HGCMSvcSetU32(&parms[0], VBOX_SHCL_TRANSFER_MODE_ DISABLED);133 HGCMSvcSetU32(&parms[0], VBOX_SHCL_TRANSFER_MODE_F_NONE); 134 134 rc = table.pfnHostCall(NULL, VBOX_SHCL_HOST_FN_SET_TRANSFER_MODE, 1, parms); 135 135 RTTESTI_CHECK_RC(rc, VINF_SUCCESS);
Note:
See TracChangeset
for help on using the changeset viewer.

