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

Timestamp:

Sep 17, 2019 1:03:39 PM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/URI: More renaming (URI -> transfer).

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• VBoxSharedClipboardSvc-darwin.cpp (modified) (7 diffs)
• VBoxSharedClipboardSvc-internal.h (modified) (5 diffs)
• VBoxSharedClipboardSvc-uri.cpp (modified) (112 diffs)
• VBoxSharedClipboardSvc-uri.h (modified) (2 diffs)
• VBoxSharedClipboardSvc-utils.cpp (modified) (4 diffs)
• VBoxSharedClipboardSvc-win.cpp (modified) (3 diffs)
• VBoxSharedClipboardSvc-x11.cpp (modified) (3 diffs)
• VBoxSharedClipboardSvc.cpp (modified) (15 diffs)

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

@@ -215 +215 @@
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-    if (pFormats->uFormats & VBOX_SHCL_FMT_URI_LIST) /* No URI support yet. */
+    if (pFormats->uFormats & VBOX_SHCL_FMT_URI_LIST) /* No transfer support yet. */
         return VINF_SUCCESS;
 #endif
@@ -277 +277 @@
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-int SharedClipboardSvcImplURIReadDir(PSHCLCLIENT pClient, PSHCLDIRDATA pDirData)
+int SharedClipboardSvcImplTransferReadDir(PSHCLCLIENT pClient, PSHCLDIRDATA pDirData)
 {
     RT_NOREF(pClient, pDirData);
@@ -283 +283 @@
 }
 
-int SharedClipboardSvcImplURIWriteDir(PSHCLCLIENT pClient, PSHCLDIRDATA pDirData)
+int SharedClipboardSvcImplTransferWriteDir(PSHCLCLIENT pClient, PSHCLDIRDATA pDirData)
 {
     RT_NOREF(pClient, pDirData);
@@ -289 +289 @@
 }
 
-int SharedClipboardSvcImplURIReadFileHdr(PSHCLCLIENT pClient, PSHCLFILEHDR pFileHdr)
+int SharedClipboardSvcImplTransferReadFileHdr(PSHCLCLIENT pClient, PSHCLFILEHDR pFileHdr)
 {
     RT_NOREF(pClient, pFileHdr);
@@ -295 +295 @@
 }
 
-int SharedClipboardSvcImplURIWriteFileHdr(PSHCLCLIENT pClient, PSHCLFILEHDR pFileHdr)
+int SharedClipboardSvcImplTransferWriteFileHdr(PSHCLCLIENT pClient, PSHCLFILEHDR pFileHdr)
 {
     RT_NOREF(pClient, pFileHdr);
@@ -301 +301 @@
 }
 
-int SharedClipboardSvcImplURIReadFileData(PSHCLCLIENT pClient, PSHCLFILEDATA pFileData)
+int SharedClipboardSvcImplTransferReadFileData(PSHCLCLIENT pClient, PSHCLFILEDATA pFileData)
 {
     RT_NOREF(pClient, pFileData);
@@ -307 +307 @@
 }
 
-int SharedClipboardSvcImplURIWriteFileData(PSHCLCLIENT pClient, PSHCLFILEDATA pFileData)
+int SharedClipboardSvcImplTransferWriteFileData(PSHCLCLIENT pClient, PSHCLFILEDATA pFileData)
 {
     RT_NOREF(pClient, pFileData);

trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-internal.h

@@ -67 +67 @@
 } SHCLCLIENTMSG, *PSHCLCLIENTMSG;
 
-typedef struct SHCLCLIENTURISTATE
+typedef struct SHCLCLIENTTRANSFERSTATE
 {
     /** Directory of the transfer to start. */
-    SHCLURITRANSFERDIR enmTransferDir;
-} SHCLCLIENTURISTATE, *PSHCLCLIENTURISTATE;
+    SHCLTRANSFERDIR enmTransferDir;
+} SHCLCLIENTTRANSFERSTATE, *PSHCLCLIENTTRANSFERSTATE;
 
 /**
@@ -93 +93 @@
     uint32_t                cbChunkSize;
     SHCLSOURCE              enmSource;
-    /** The client's URI state. */
-    SHCLCLIENTURISTATE      URI;
+    /** The client's transfers state. */
+    SHCLCLIENTTRANSFERSTATE Transfers;
 } SHCLCLIENTSTATE, *PSHCLCLIENTSTATE;
 
@@ -112 +112 @@
     SHCLEVENTSOURCE          Events;
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-    /** URI context data. */
-    SHCLURICTX               URI;
+    /** Transfer contextdata. */
+    SHCLTRANSFERCTX          TransferCtx;
 #endif
     /** Structure for keeping the client's pending (deferred return) state.
@@ -197 +197 @@
 
 # ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-int sharedClipboardSvcURITransferStart(PSHCLCLIENT pClient,
-                                     SHCLURITRANSFERDIR enmDir, SHCLSOURCE enmSource,
-                                     PSHCLURITRANSFER *ppTransfer);
-bool sharedClipboardSvcURIMsgIsAllowed(uint32_t uMode, uint32_t uMsg);
+int sharedClipboardSvcTransferTransferStart(PSHCLCLIENT pClient,
+                                     SHCLTRANSFERDIR enmDir, SHCLSOURCE enmSource,
+                                     PSHCLTRANSFER *ppTransfer);
+bool sharedClipboardSvcTransferMsgIsAllowed(uint32_t uMode, uint32_t uMsg);
 # endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
 
@@ -222 +222 @@
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-int sharedClipboardSvcURITransferOpen(PSHCLPROVIDERCTX pCtx);
-DECLCALLBACK(int) sharedClipboardSvcURITransferClose(PSHCLPROVIDERCTX pCtx);
-
-int sharedClipboardSvcURIGetRoots(PSHCLPROVIDERCTX pCtx, PSHCLROOTLIST *ppRootList);
-
-int sharedClipboardSvcURIListOpen(PSHCLPROVIDERCTX pCtx, PSHCLLISTOPENPARMS pOpenParms, PSHCLLISTHANDLE phList);
-int sharedClipboardSvcURIListClose(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList);
-int sharedClipboardSvcURIListHdrRead(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList, PSHCLLISTHDR pListHdr);
-int sharedClipboardSvcURIListHdrWrite(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList, PSHCLLISTHDR pListHdr);
-int sharedClipboardSvcURIListEntryRead(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList, PSHCLLISTENTRY pListEntry);
-int sharedClipboardSvcURIListEntryWrite(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList, PSHCLLISTENTRY pListEntry);
-
-int sharedClipboardSvcURIObjOpen(PSHCLPROVIDERCTX pCtx, PSHCLOBJOPENCREATEPARMS pCreateParms,
+int sharedClipboardSvcTransferTransferOpen(PSHCLPROVIDERCTX pCtx);
+DECLCALLBACK(int) sharedClipboardSvcTransferTransferClose(PSHCLPROVIDERCTX pCtx);
+
+int sharedClipboardSvcTransferGetRoots(PSHCLPROVIDERCTX pCtx, PSHCLROOTLIST *ppRootList);
+
+int sharedClipboardSvcTransferListOpen(PSHCLPROVIDERCTX pCtx, PSHCLLISTOPENPARMS pOpenParms, PSHCLLISTHANDLE phList);
+int sharedClipboardSvcTransferListClose(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList);
+int sharedClipboardSvcTransferListHdrRead(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList, PSHCLLISTHDR pListHdr);
+int sharedClipboardSvcTransferListHdrWrite(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList, PSHCLLISTHDR pListHdr);
+int sharedClipboardSvcTransferListEntryRead(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList, PSHCLLISTENTRY pListEntry);
+int sharedClipboardSvcTransferListEntryWrite(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList, PSHCLLISTENTRY pListEntry);
+
+int sharedClipboardSvcTransferObjOpen(PSHCLPROVIDERCTX pCtx, PSHCLOBJOPENCREATEPARMS pCreateParms,
                                  PSHCLOBJHANDLE phObj);
-int sharedClipboardSvcURIObjClose(PSHCLPROVIDERCTX pCtx, SHCLOBJHANDLE hObj);
-int sharedClipboardSvcURIObjRead(PSHCLPROVIDERCTX pCtx, SHCLOBJHANDLE hObj,
+int sharedClipboardSvcTransferObjClose(PSHCLPROVIDERCTX pCtx, SHCLOBJHANDLE hObj);
+int sharedClipboardSvcTransferObjRead(PSHCLPROVIDERCTX pCtx, SHCLOBJHANDLE hObj,
                                  void *pvData, uint32_t cbData, uint32_t fFlags, uint32_t *pcbRead);
-int sharedClipboardSvcURIObjWrite(PSHCLPROVIDERCTX pCtx, SHCLOBJHANDLE hObj,
+int sharedClipboardSvcTransferObjWrite(PSHCLPROVIDERCTX pCtx, SHCLOBJHANDLE hObj,
                                   void *pvData, uint32_t cbData, uint32_t fFlags, uint32_t *pcbWritten);
 
-DECLCALLBACK(void) VBoxSvcClipboardURITransferPrepareCallback(PSHCLURITRANSFERCALLBACKDATA pData);
-DECLCALLBACK(void) VBoxSvcClipboardURIDataHeaderCompleteCallback(PSHCLURITRANSFERCALLBACKDATA pData);
-DECLCALLBACK(void) VBoxSvcClipboardURIDataCompleteCallback(PSHCLURITRANSFERCALLBACKDATA pData);
-DECLCALLBACK(void) VBoxSvcClipboardURITransferCompleteCallback(PSHCLURITRANSFERCALLBACKDATA pData, int rc);
-DECLCALLBACK(void) VBoxSvcClipboardURITransferCanceledCallback(PSHCLURITRANSFERCALLBACKDATA pData);
-DECLCALLBACK(void) VBoxSvcClipboardURITransferErrorCallback(PSHCLURITRANSFERCALLBACKDATA pData, int rc);
-
-int SharedClipboardSvcImplURITransferCreate(PSHCLCLIENT pClient, PSHCLURITRANSFER pTransfer);
-int SharedClipboardSvcImplURITransferDestroy(PSHCLCLIENT pClient, PSHCLURITRANSFER pTransfer);
+DECLCALLBACK(void) VBoxSvcClipboardTransferPrepareCallback(PSHCLTRANSFERCALLBACKDATA pData);
+DECLCALLBACK(void) VBoxSvcClipboardDataHeaderCompleteCallback(PSHCLTRANSFERCALLBACKDATA pData);
+DECLCALLBACK(void) VBoxSvcClipboardDataCompleteCallback(PSHCLTRANSFERCALLBACKDATA pData);
+DECLCALLBACK(void) VBoxSvcClipboardTransferCompleteCallback(PSHCLTRANSFERCALLBACKDATA pData, int rc);
+DECLCALLBACK(void) VBoxSvcClipboardTransferCanceledCallback(PSHCLTRANSFERCALLBACKDATA pData);
+DECLCALLBACK(void) VBoxSvcClipboardTransferErrorCallback(PSHCLTRANSFERCALLBACKDATA pData, int rc);
+
+int SharedClipboardSvcImplTransferCreate(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer);
+int SharedClipboardSvcImplTransferDestroy(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer);
 #endif /*VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
 

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * Shared Clipboard Service - Internal code for URI (list) handling.
+ * Shared Clipboard Service - Internal code for transfer (list) handling.
  */
 
@@ -48 +48 @@
 *   Prototypes                                                                                                                   *
 *********************************************************************************************************************************/
-static int sharedClipboardSvcURISetListOpen(uint32_t cParms, VBOXHGCMSVCPARM paParms[],
-                                            PSHCLMSGCTX pMsgCtx, PSHCLLISTOPENPARMS pOpenParms);
-static int sharedClipboardSvcURISetListClose(uint32_t cParms, VBOXHGCMSVCPARM paParms[],
-                                             PSHCLMSGCTX pMsgCtx, SHCLLISTHANDLE hList);
+static int sharedClipboardSvcTransferSetListOpen(uint32_t cParms, VBOXHGCMSVCPARM paParms[],
+                                                 PSHCLMSGCTX pMsgCtx, PSHCLLISTOPENPARMS pOpenParms);
+static int sharedClipboardSvcTransferSetListClose(uint32_t cParms, VBOXHGCMSVCPARM paParms[],
+                                                  PSHCLMSGCTX pMsgCtx, SHCLLISTHANDLE hList);
 
 
@@ -58 +58 @@
 *********************************************************************************************************************************/
 
-DECLCALLBACK(int) sharedClipboardSvcURITransferOpen(PSHCLPROVIDERCTX pCtx)
+DECLCALLBACK(int) sharedClipboardSvcTransferTransferOpen(PSHCLPROVIDERCTX pCtx)
 {
     RT_NOREF(pCtx);
@@ -66 +66 @@
 }
 
-DECLCALLBACK(int) sharedClipboardSvcURITransferClose(PSHCLPROVIDERCTX pCtx)
+DECLCALLBACK(int) sharedClipboardSvcTransferTransferClose(PSHCLPROVIDERCTX pCtx)
 {
     RT_NOREF(pCtx);
@@ -74 +74 @@
 }
 
-DECLCALLBACK(int) sharedClipboardSvcURIGetRoots(PSHCLPROVIDERCTX pCtx, PSHCLROOTLIST *ppRootList)
+DECLCALLBACK(int) sharedClipboardSvcTransferGetRoots(PSHCLPROVIDERCTX pCtx, PSHCLROOTLIST *ppRootList)
 {
     LogFlowFuncEnter();
@@ -83 +83 @@
     int rc;
 
-    PSHCLCLIENTMSG pMsgHdr = sharedClipboardSvcMsgAlloc(VBOX_SHCL_HOST_MSG_URI_ROOT_LIST_HDR_READ,
+    PSHCLCLIENTMSG pMsgHdr = sharedClipboardSvcMsgAlloc(VBOX_SHCL_HOST_MSG_TRANSFER_ROOT_LIST_HDR_READ,
                                                         VBOX_SHCL_CPARMS_ROOT_LIST_HDR_READ);
     if (pMsgHdr)
@@ -112 +112 @@
                     LogFlowFunc(("cRoots=%RU32, fRoots=0x%x\n", pSrcRootListHdr->cRoots, pSrcRootListHdr->fRoots));
 
-                    PSHCLROOTLIST pRootList = SharedClipboardURIRootListAlloc();
+                    PSHCLROOTLIST pRootList = SharedClipboardTransferRootListAlloc();
                     if (pRootList)
                     {
@@ -124 +124 @@
                                 for (uint32_t i = 0; i < pSrcRootListHdr->cRoots; i++)
                                 {
-                                    PSHCLCLIENTMSG pMsgEntry = sharedClipboardSvcMsgAlloc(VBOX_SHCL_HOST_MSG_URI_ROOT_LIST_ENTRY_READ,
+                                    PSHCLCLIENTMSG pMsgEntry = sharedClipboardSvcMsgAlloc(VBOX_SHCL_HOST_MSG_TRANSFER_ROOT_LIST_ENTRY_READ,
                                                                                           VBOX_SHCL_CPARMS_ROOT_LIST_ENTRY_READ_REQ);
 
@@ -151 +151 @@
                                     Assert(pPayloadEntry->cbData == sizeof(SHCLROOTLISTENTRY));
 
-                                    rc = SharedClipboardURIListEntryCopy(&pRootList->paEntries[i], pSrcRootListEntry);
+                                    rc = SharedClipboardTransferListEntryCopy(&pRootList->paEntries[i], pSrcRootListEntry);
 
                                     SharedClipboardPayloadFree(pPayloadEntry);
@@ -173 +173 @@
                         }
                         else
-                            SharedClipboardURIRootListFree(pRootList);
+                            SharedClipboardTransferRootListFree(pRootList);
 
                         SharedClipboardPayloadFree(pPayloadHdr);
@@ -192 +192 @@
 }
 
-DECLCALLBACK(int) sharedClipboardSvcURIListOpen(PSHCLPROVIDERCTX pCtx,
-                                                PSHCLLISTOPENPARMS pOpenParms, PSHCLLISTHANDLE phList)
+DECLCALLBACK(int) sharedClipboardSvcTransferListOpen(PSHCLPROVIDERCTX pCtx,
+                                                     PSHCLLISTOPENPARMS pOpenParms, PSHCLLISTHANDLE phList)
 {
     LogFlowFuncEnter();
@@ -202 +202 @@
     int rc;
 
-    PSHCLCLIENTMSG pMsg = sharedClipboardSvcMsgAlloc(VBOX_SHCL_HOST_MSG_URI_LIST_OPEN,
+    PSHCLCLIENTMSG pMsg = sharedClipboardSvcMsgAlloc(VBOX_SHCL_HOST_MSG_TRANSFER_LIST_OPEN,
                                                      VBOX_SHCL_CPARMS_LIST_OPEN);
     if (pMsg)
@@ -211 +211 @@
                                                                       uEvent);
 
-        rc = sharedClipboardSvcURISetListOpen(pMsg->cParms, pMsg->paParms, &pMsg->Ctx, pOpenParms);
+        rc = sharedClipboardSvcTransferSetListOpen(pMsg->cParms, pMsg->paParms, &pMsg->Ctx, pOpenParms);
         if (RT_SUCCESS(rc))
         {
@@ -251 +251 @@
 }
 
-DECLCALLBACK(int) sharedClipboardSvcURIListClose(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList)
+DECLCALLBACK(int) sharedClipboardSvcTransferListClose(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList)
 {
     LogFlowFuncEnter();
@@ -260 +260 @@
     int rc;
 
-    PSHCLCLIENTMSG pMsg = sharedClipboardSvcMsgAlloc(VBOX_SHCL_HOST_MSG_URI_LIST_CLOSE,
+    PSHCLCLIENTMSG pMsg = sharedClipboardSvcMsgAlloc(VBOX_SHCL_HOST_MSG_TRANSFER_LIST_CLOSE,
                                                      VBOX_SHCL_CPARMS_LIST_CLOSE);
     if (pMsg)
@@ -269 +269 @@
                                                                     uEvent);
 
-        rc = sharedClipboardSvcURISetListClose(pMsg->cParms, pMsg->paParms, &pMsg->Ctx, hList);
+        rc = sharedClipboardSvcTransferSetListClose(pMsg->cParms, pMsg->paParms, &pMsg->Ctx, hList);
         if (RT_SUCCESS(rc))
         {
@@ -298 +298 @@
 }
 
-DECLCALLBACK(int) sharedClipboardSvcURIListHdrRead(PSHCLPROVIDERCTX pCtx,
-                                                   SHCLLISTHANDLE hList, PSHCLLISTHDR pListHdr)
+DECLCALLBACK(int) sharedClipboardSvcTransferListHdrRead(PSHCLPROVIDERCTX pCtx,
+                                                        SHCLLISTHANDLE hList, PSHCLLISTHDR pListHdr)
 {
     LogFlowFuncEnter();
@@ -308 +308 @@
     int rc;
 
-    PSHCLCLIENTMSG pMsg = sharedClipboardSvcMsgAlloc(VBOX_SHCL_HOST_MSG_URI_LIST_HDR_READ,
+    PSHCLCLIENTMSG pMsg = sharedClipboardSvcMsgAlloc(VBOX_SHCL_HOST_MSG_TRANSFER_LIST_HDR_READ,
                                                      VBOX_SHCL_CPARMS_LIST_HDR_READ_REQ);
     if (pMsg)
@@ -349 +349 @@
 }
 
-DECLCALLBACK(int) sharedClipboardSvcURIListHdrWrite(PSHCLPROVIDERCTX pCtx,
-                                                    SHCLLISTHANDLE hList, PSHCLLISTHDR pListHdr)
+DECLCALLBACK(int) sharedClipboardSvcTransferListHdrWrite(PSHCLPROVIDERCTX pCtx,
+                                                         SHCLLISTHANDLE hList, PSHCLLISTHDR pListHdr)
 {
     RT_NOREF(pCtx, hList, pListHdr);
@@ -359 +359 @@
 }
 
-DECLCALLBACK(int) sharedClipboardSvcURIListEntryRead(PSHCLPROVIDERCTX pCtx,
-                                                     SHCLLISTHANDLE hList, PSHCLLISTENTRY pListEntry)
+DECLCALLBACK(int) sharedClipboardSvcTransferListEntryRead(PSHCLPROVIDERCTX pCtx,
+                                                          SHCLLISTHANDLE hList, PSHCLLISTENTRY pListEntry)
 {
     LogFlowFuncEnter();
@@ -369 +369 @@
     int rc;
 
-    PSHCLCLIENTMSG pMsg = sharedClipboardSvcMsgAlloc(VBOX_SHCL_HOST_MSG_URI_LIST_ENTRY_READ,
+    PSHCLCLIENTMSG pMsg = sharedClipboardSvcMsgAlloc(VBOX_SHCL_HOST_MSG_TRANSFER_LIST_ENTRY_READ,
                                                      VBOX_SHCL_CPARMS_LIST_ENTRY_READ);
     if (pMsg)
@@ -395 +395 @@
                     Assert(pPayload->cbData == sizeof(SHCLLISTENTRY));
 
-                    rc = SharedClipboardURIListEntryCopy(pListEntry, (PSHCLLISTENTRY)pPayload->pvData);
+                    rc = SharedClipboardTransferListEntryCopy(pListEntry, (PSHCLLISTENTRY)pPayload->pvData);
 
                     SharedClipboardPayloadFree(pPayload);
@@ -409 +409 @@
 }
 
-DECLCALLBACK(int) sharedClipboardSvcURIListEntryWrite(PSHCLPROVIDERCTX pCtx,
-                                                      SHCLLISTHANDLE hList, PSHCLLISTENTRY pListEntry)
+DECLCALLBACK(int) sharedClipboardSvcTransferListEntryWrite(PSHCLPROVIDERCTX pCtx,
+                                                           SHCLLISTHANDLE hList, PSHCLLISTENTRY pListEntry)
 {
     RT_NOREF(pCtx, hList, pListEntry);
@@ -419 +419 @@
 }
 
-int sharedClipboardSvcURIObjOpen(PSHCLPROVIDERCTX pCtx, PSHCLOBJOPENCREATEPARMS pCreateParms,
-                                 PSHCLOBJHANDLE phObj)
+int sharedClipboardSvcTransferObjOpen(PSHCLPROVIDERCTX pCtx, PSHCLOBJOPENCREATEPARMS pCreateParms,
+                                      PSHCLOBJHANDLE phObj)
 {
     LogFlowFuncEnter();
@@ -429 +429 @@
     int rc;
 
-    PSHCLCLIENTMSG pMsg = sharedClipboardSvcMsgAlloc(VBOX_SHCL_HOST_MSG_URI_OBJ_OPEN,
+    PSHCLCLIENTMSG pMsg = sharedClipboardSvcMsgAlloc(VBOX_SHCL_HOST_MSG_TRANSFER_OBJ_OPEN,
                                                      VBOX_SHCL_CPARMS_OBJ_OPEN);
     if (pMsg)
@@ -480 +480 @@
 }
 
-int sharedClipboardSvcURIObjClose(PSHCLPROVIDERCTX pCtx, SHCLOBJHANDLE hObj)
+int sharedClipboardSvcTransferObjClose(PSHCLPROVIDERCTX pCtx, SHCLOBJHANDLE hObj)
 {
     LogFlowFuncEnter();
@@ -489 +489 @@
     int rc;
 
-    PSHCLCLIENTMSG pMsg = sharedClipboardSvcMsgAlloc(VBOX_SHCL_HOST_MSG_URI_OBJ_CLOSE,
+    PSHCLCLIENTMSG pMsg = sharedClipboardSvcMsgAlloc(VBOX_SHCL_HOST_MSG_TRANSFER_OBJ_CLOSE,
                                                      VBOX_SHCL_CPARMS_OBJ_CLOSE);
     if (pMsg)
@@ -533 +533 @@
 }
 
-int sharedClipboardSvcURIObjRead(PSHCLPROVIDERCTX pCtx, SHCLOBJHANDLE hObj,
-                                 void *pvData, uint32_t cbData, uint32_t fFlags, uint32_t *pcbRead)
+int sharedClipboardSvcTransferObjRead(PSHCLPROVIDERCTX pCtx, SHCLOBJHANDLE hObj,
+                                      void *pvData, uint32_t cbData, uint32_t fFlags, uint32_t *pcbRead)
 {
     LogFlowFuncEnter();
@@ -543 +543 @@
     int rc;
 
-    PSHCLCLIENTMSG pMsg = sharedClipboardSvcMsgAlloc(VBOX_SHCL_HOST_MSG_URI_OBJ_READ,
+    PSHCLCLIENTMSG pMsg = sharedClipboardSvcMsgAlloc(VBOX_SHCL_HOST_MSG_TRANSFER_OBJ_READ,
                                                      VBOX_SHCL_CPARMS_OBJ_READ_REQ);
     if (pMsg)
@@ -592 +592 @@
 }
 
-int sharedClipboardSvcURIObjWrite(PSHCLPROVIDERCTX pCtx, SHCLOBJHANDLE hObj,
-                                  void *pvData, uint32_t cbData, uint32_t fFlags, uint32_t *pcbWritten)
+int sharedClipboardSvcTransferObjWrite(PSHCLPROVIDERCTX pCtx, SHCLOBJHANDLE hObj,
+                                       void *pvData, uint32_t cbData, uint32_t fFlags, uint32_t *pcbWritten)
 {
     LogFlowFuncEnter();
@@ -602 +602 @@
     int rc;
 
-    PSHCLCLIENTMSG pMsg = sharedClipboardSvcMsgAlloc(VBOX_SHCL_HOST_MSG_URI_OBJ_WRITE,
+    PSHCLCLIENTMSG pMsg = sharedClipboardSvcMsgAlloc(VBOX_SHCL_HOST_MSG_TRANSFER_OBJ_WRITE,
                                                      VBOX_SHCL_CPARMS_OBJ_WRITE);
     if (pMsg)
@@ -648 +648 @@
 
 /*********************************************************************************************************************************
-*   URI callbacks                                                                                                                *
+*   transfer callbacks                                                                                                                *
 *********************************************************************************************************************************/
 
-DECLCALLBACK(void) VBoxSvcClipboardURITransferPrepareCallback(PSHCLURITRANSFERCALLBACKDATA pData)
+DECLCALLBACK(void) VBoxSvcClipboardTransferPrepareCallback(PSHCLTRANSFERCALLBACKDATA pData)
 {
     RT_NOREF(pData);
@@ -658 +658 @@
 }
 
-DECLCALLBACK(void) VBoxSvcClipboardURITransferCompleteCallback(PSHCLURITRANSFERCALLBACKDATA pData, int rc)
+DECLCALLBACK(void) VBoxSvcClipboardTransferCompleteCallback(PSHCLTRANSFERCALLBACKDATA pData, int rc)
 {
     RT_NOREF(pData, rc);
@@ -667 +667 @@
 }
 
-DECLCALLBACK(void) VBoxSvcClipboardURITransferCanceledCallback(PSHCLURITRANSFERCALLBACKDATA pData)
+DECLCALLBACK(void) VBoxSvcClipboardTransferCanceledCallback(PSHCLTRANSFERCALLBACKDATA pData)
 {
     LogFlowFuncEnter();
@@ -676 +676 @@
 }
 
-DECLCALLBACK(void) VBoxSvcClipboardURITransferErrorCallback(PSHCLURITRANSFERCALLBACKDATA pData, int rc)
+DECLCALLBACK(void) VBoxSvcClipboardTransferErrorCallback(PSHCLTRANSFERCALLBACKDATA pData, int rc)
 {
     LogFlowFuncEnter();
@@ -691 +691 @@
 
 /**
- * Gets an URI message reply from HGCM service parameters.
+ * Gets a transfer message reply from HGCM service parameters.
  *
  * @returns VBox status code.
@@ -698 +698 @@
  * @param   pReply              Where to store the reply.
  */
-static int sharedClipboardSvcURIGetReply(uint32_t cParms, VBOXHGCMSVCPARM paParms[],
-                                         PSHCLREPLY pReply)
+static int sharedClipboardSvcTransferGetReply(uint32_t cParms, VBOXHGCMSVCPARM paParms[],
+                                              PSHCLREPLY pReply)
 {
     int rc;
@@ -767 +767 @@
 
 /**
- * Gets an URI root list header from HGCM service parameters.
+ * Gets a transfer root list header from HGCM service parameters.
  *
  * @returns VBox status code.
  * @param   cParms              Number of HGCM parameters supplied in \a paParms.
  * @param   paParms             Array of HGCM parameters.
- * @param   pRootLstHdr         Where to store the URI root list header on success.
+ * @param   pRootLstHdr         Where to store the transfer root list header on success.
  */
-static int sharedClipboardSvcURIGetRootListHdr(uint32_t cParms, VBOXHGCMSVCPARM paParms[],
-                                               PSHCLROOTLISTHDR pRootLstHdr)
+static int sharedClipboardSvcTransferGetRootListHdr(uint32_t cParms, VBOXHGCMSVCPARM paParms[],
+                                                    PSHCLROOTLISTHDR pRootLstHdr)
 {
     int rc;
@@ -793 +793 @@
 
 /**
- * Gets an URI root list entry from HGCM service parameters.
+ * Gets a transfer root list entry from HGCM service parameters.
  *
  * @returns VBox status code.
@@ -800 +800 @@
  * @param   pListEntry          Where to store the root list entry.
  */
-static int sharedClipboardSvcURIGetRootListEntry(uint32_t cParms, VBOXHGCMSVCPARM paParms[],
-                                                 PSHCLROOTLISTENTRY pListEntry)
+static int sharedClipboardSvcTransferGetRootListEntry(uint32_t cParms, VBOXHGCMSVCPARM paParms[],
+                                                      PSHCLROOTLISTENTRY pListEntry)
 {
     int rc;
@@ -830 +830 @@
 
 /**
- * Gets an URI list open request from HGCM service parameters.
+ * Gets a transfer list open request from HGCM service parameters.
  *
  * @returns VBox status code.
@@ -837 +837 @@
  * @param   pOpenParms          Where to store the open parameters of the request.
  */
-static int sharedClipboardSvcURIGetListOpen(uint32_t cParms, VBOXHGCMSVCPARM paParms[],
-                                            PSHCLLISTOPENPARMS pOpenParms)
+static int sharedClipboardSvcTransferGetListOpen(uint32_t cParms, VBOXHGCMSVCPARM paParms[],
+                                                 PSHCLLISTOPENPARMS pOpenParms)
 {
     int rc;
@@ -876 +876 @@
 
 /**
- * Sets an URI list open request to HGCM service parameters.
+ * Sets a transfer list open request to HGCM service parameters.
  *
  * @returns VBox status code.
@@ -884 +884 @@
  * @param   pOpenParms          List open parameters to set.
  */
-static int sharedClipboardSvcURISetListOpen(uint32_t cParms, VBOXHGCMSVCPARM paParms[],
-                                            PSHCLMSGCTX pMsgCtx, PSHCLLISTOPENPARMS pOpenParms)
+static int sharedClipboardSvcTransferSetListOpen(uint32_t cParms, VBOXHGCMSVCPARM paParms[],
+                                                 PSHCLMSGCTX pMsgCtx, PSHCLLISTOPENPARMS pOpenParms)
 {
     int rc;
@@ -909 +909 @@
 
 /**
- * Sets an URI list close request to HGCM service parameters.
+ * Sets a transfer list close request to HGCM service parameters.
  *
  * @returns VBox status code.
@@ -917 +917 @@
  * @param   hList               Handle of list to close.
  */
-static int sharedClipboardSvcURISetListClose(uint32_t cParms, VBOXHGCMSVCPARM paParms[],
-                                             PSHCLMSGCTX pMsgCtx, SHCLLISTHANDLE hList)
+static int sharedClipboardSvcTransferSetListClose(uint32_t cParms, VBOXHGCMSVCPARM paParms[],
+                                                  PSHCLMSGCTX pMsgCtx, SHCLLISTHANDLE hList)
 {
     int rc;
@@ -937 +937 @@
 
 /**
- * Gets an URI list header from HGCM service parameters.
+ * Gets a transfer list header from HGCM service parameters.
  *
  * @returns VBox status code.
@@ -945 +945 @@
  * @param   pListHdr            Where to store the list header.
  */
-static int sharedClipboardSvcURIGetListHdr(uint32_t cParms, VBOXHGCMSVCPARM paParms[],
-                                           PSHCLLISTHANDLE phList, PSHCLLISTHDR pListHdr)
+static int sharedClipboardSvcTransferGetListHdr(uint32_t cParms, VBOXHGCMSVCPARM paParms[],
+                                                PSHCLLISTHANDLE phList, PSHCLLISTHDR pListHdr)
 {
     int rc;
@@ -976 +976 @@
 #if 0
 /**
- * Sets an URI list header to HGCM service parameters.
+ * Sets a transfer list header to HGCM service parameters.
  *
  * @returns VBox status code.
@@ -984 +984 @@
  * @param   pListHdr            Pointer to data to set to the HGCM parameters.
  */
-static int sharedClipboardSvcURISetListHdr(uint32_t cParms, VBOXHGCMSVCPARM paParms[],
-                                           PVBOXSHCLMSGCTX pMsgCtx, PSHCLLISTHDR pListHdr)
+static int sharedClipboardSvcTransferSetListHdr(uint32_t cParms, VBOXHGCMSVCPARM paParms[],
+                                                PVBOXSHCLMSGCTX pMsgCtx, PSHCLLISTHDR pListHdr)
 {
     int rc;
@@ -1011 +1011 @@
 
 /**
- * Gets an URI list entry from HGCM service parameters.
+ * Gets a transfer list entry from HGCM service parameters.
  *
  * @returns VBox status code.
@@ -1019 +1019 @@
  * @param   pListEntry          Where to store the list entry.
  */
-static int sharedClipboardSvcURIGetListEntry(uint32_t cParms, VBOXHGCMSVCPARM paParms[],
-                                             PSHCLLISTHANDLE phList, PSHCLLISTENTRY pListEntry)
+static int sharedClipboardSvcTransferGetListEntry(uint32_t cParms, VBOXHGCMSVCPARM paParms[],
+                                                  PSHCLLISTHANDLE phList, PSHCLLISTENTRY pListEntry)
 {
     int rc;
@@ -1044 +1044 @@
         if (RT_SUCCESS(rc))
         {
-            if (!SharedClipboardURIListEntryIsValid(pListEntry))
+            if (!SharedClipboardTransferListEntryIsValid(pListEntry))
                 rc = VERR_INVALID_PARAMETER;
         }
@@ -1057 +1057 @@
 #if 0
 /**
- * Sets an URI data chunk to HGCM service parameters.
+ * Sets a transfer data  chunk to HGCM service parameters.
  *
  * @returns VBox status code.
@@ -1065 +1065 @@
  * @param   pListEntry          Pointer to data to set to the HGCM parameters.
  */
-static int sharedClipboardSvcURISetListEntry(uint32_t cParms, VBOXHGCMSVCPARM paParms[],
-                                           PVBOXSHCLMSGCTX pMsgCtx, PSHCLLISTENTRY pListEntry)
+static int sharedClipboardSvcTransferSetListEntry(uint32_t cParms, VBOXHGCMSVCPARM paParms[],
+                                                  PVBOXSHCLMSGCTX pMsgCtx, PSHCLLISTENTRY pListEntry)
 {
     int rc;
@@ -1090 +1090 @@
 
 /**
- * Gets an URI object data chunk from HGCM service parameters.
+ * Gets a transfer object data chunk from HGCM service parameters.
  *
  * @returns VBox status code.
@@ -1097 +1097 @@
  * @param   pDataChunk          Where to store the object data chunk data.
  */
-static int sharedClipboardSvcURIGetObjDataChunk(uint32_t cParms, VBOXHGCMSVCPARM paParms[], PSHCLOBJDATACHUNK pDataChunk)
+static int sharedClipboardSvcTransferGetObjDataChunk(uint32_t cParms, VBOXHGCMSVCPARM paParms[], PSHCLOBJDATACHUNK pDataChunk)
 {
     AssertPtrReturn(paParms,    VERR_INVALID_PARAMETER);
@@ -1128 +1128 @@
 
 /**
- * Gets an URI error from HGCM service parameters.
+ * Gets a transfer error from HGCM service parameters.
  *
  * @returns VBox status code.
@@ -1135 +1135 @@
  * @param   pRc                 Where to store the received error code.
  */
-static int sharedClipboardSvcURIGetError(uint32_t cParms, VBOXHGCMSVCPARM paParms[], int *pRc)
+static int sharedClipboardSvcTransferGetError(uint32_t cParms, VBOXHGCMSVCPARM paParms[], int *pRc)
 {
     AssertPtrReturn(paParms, VERR_INVALID_PARAMETER);
@@ -1162 +1162 @@
  * @param   paParms             Array function parameters supplied.
  */
-static int sharedClipboardSvcURITransferHandleReply(PSHCLCLIENT pClient, PSHCLURITRANSFER pTransfer,
-                                                    uint32_t cParms, VBOXHGCMSVCPARM paParms[])
+static int sharedClipboardSvcTransferTransferHandleReply(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer,
+                                                         uint32_t cParms, VBOXHGCMSVCPARM paParms[])
 {
     RT_NOREF(pClient);
@@ -1173 +1173 @@
     if (pReply)
     {
-        rc = sharedClipboardSvcURIGetReply(cParms, paParms, pReply);
+        rc = sharedClipboardSvcTransferGetReply(cParms, paParms, pReply);
         if (RT_SUCCESS(rc))
         {
@@ -1237 +1237 @@
 
 /**
- * URI client (guest) handler for the Shared Clipboard host service.
+ * transfer client (guest) handler for the Shared Clipboard host service.
  *
  * @returns VBox status code.
@@ -1247 +1247 @@
  * @param   tsArrival           Timestamp of arrival.
  */
-int sharedClipboardSvcURIHandler(PSHCLCLIENT pClient,
+int sharedClipboardSvcTransferHandler(PSHCLCLIENT pClient,
                                 VBOXHGCMCALLHANDLE callHandle,
                                 uint32_t u32Function,
@@ -1261 +1261 @@
 #if 0
     /* Check if we've the right mode set. */
-    if (!sharedClipboardSvcURIMsgIsAllowed(sharedClipboardSvcGetMode(), u32Function))
+    if (!sharedClipboardSvcTransferMsgIsAllowed(sharedClipboardSvcGetMode(), u32Function))
     {
         LogFunc(("Wrong clipboard mode, denying access\n"));
@@ -1275 +1275 @@
         AssertPtr(g_ExtState.pfnExtension);
 #endif
-        LogFunc(("Invalid / no service extension set, skipping URI handling\n"));
+        LogFunc(("Invalid / no service extension set, skipping transfer handling\n"));
         return VERR_NOT_SUPPORTED;
     }
@@ -1285 +1285 @@
      */
     uint32_t         uCID      = 0; /* Context ID */
-    PSHCLURITRANSFER pTransfer = NULL;
+    PSHCLTRANSFER pTransfer = NULL;
 
     switch (u32Function)
@@ -1293 +1293 @@
         default:
         {
-            if (!SharedClipboardURICtxGetTotalTransfers(&pClient->URI))
+            if (!SharedClipboardTransferCtxGetTotalTransfers(&pClient->TransferCtx))
             {
                 LogFunc(("No transfers found\n"));
@@ -1307 +1307 @@
                 break;
 
-            const SHCLURITRANSFERID uTransferID = VBOX_SHCL_CONTEXTID_GET_TRANSFER(uCID);
-
-            pTransfer = SharedClipboardURICtxGetTransfer(&pClient->URI, uTransferID);
+            const SHCLTRANSFERID uTransferID = VBOX_SHCL_CONTEXTID_GET_TRANSFER(uCID);
+
+            pTransfer = SharedClipboardTransferCtxGetTransfer(&pClient->TransferCtx, uTransferID);
             if (!pTransfer)
             {
@@ -1334 +1334 @@
                 break;
 
-            SHCLURITRANSFERSTATUS uStatus = SHCLURITRANSFERSTATUS_NONE;
+            SHCLTRANSFERSTATUS uStatus = SHCLTRANSFERSTATUS_NONE;
             rc = HGCMSvcGetU32(&paParms[1], &uStatus);
             if (RT_FAILURE(rc))
@@ -1341 +1341 @@
             LogFlowFunc(("uStatus: %RU32\n", uStatus));
 
-            SharedClipboardURICtxTransfersCleanup(&pClient->URI);
-
-            if (SharedClipboardURICtxTransfersMaximumReached(&pClient->URI))
+            SharedClipboardTransferCtxTransfersCleanup(&pClient->URI);
+
+            if (SharedClipboardTransferCtxTransfersMaximumReached(&pClient->URI))
             {
                 rc = VERR_SHCLPB_MAX_TRANSFERS_REACHED;
@@ -1349 +1349 @@
             }
 
-            if (uStatus == SHCLURITRANSFERSTATUS_RUNNING)
-            {
-                const SHCLURITRANSFERDIR enmDir = SHCLURITRANSFERDIR_READ;
-
-                PSHCLURITRANSFER pTransfer;
-                rc = SharedClipboardURITransferCreate(enmDir,
+            if (uStatus == SHCLTRANSFERSTATUS_RUNNING)
+            {
+                const SHCLTRANSFERDIR enmDir = SHCLTRANSFERDIR_READ;
+
+                PSHCLTRANSFER pTransfer;
+                rc = SharedClipboardTransferCreate(enmDir,
                                                       SHCLSOURCE_REMOTE, &pTransfer);
                 if (RT_SUCCESS(rc))
                 {
-                    rc = sharedClipboardSvcURIAreaRegister(&pClient->State, pTransfer);
+                    rc = sharedClipboardSvcTransferAreaRegister(&pClient->State, pTransfer);
                     if (RT_SUCCESS(rc))
                     {
@@ -1366 +1366 @@
                         creationCtx.enmSource = pClient->State.enmSource;
 
-                        creationCtx.Interface.pfnTransferOpen  = sharedClipboardSvcURITransferOpen;
-                        creationCtx.Interface.pfnTransferClose = sharedClipboardSvcURITransferClose;
-                        creationCtx.Interface.pfnListOpen      = sharedClipboardSvcURIListOpen;
-                        creationCtx.Interface.pfnListClose     = sharedClipboardSvcURIListClose;
-                        creationCtx.Interface.pfnObjOpen       = sharedClipboardSvcURIObjOpen;
-                        creationCtx.Interface.pfnObjClose      = sharedClipboardSvcURIObjClose;
-
-                        if (enmDir == SHCLURITRANSFERDIR_READ)
+                        creationCtx.Interface.pfnTransferOpen  = sharedClipboardSvcTransferTransferOpen;
+                        creationCtx.Interface.pfnTransferClose = sharedClipboardSvcTransferTransferClose;
+                        creationCtx.Interface.pfnListOpen      = sharedClipboardSvcTransferListOpen;
+                        creationCtx.Interface.pfnListClose     = sharedClipboardSvcTransferListClose;
+                        creationCtx.Interface.pfnObjOpen       = sharedClipboardSvcTransferObjOpen;
+                        creationCtx.Interface.pfnObjClose      = sharedClipboardSvcTransferObjClose;
+
+                        if (enmDir == SHCLTRANSFERDIR_READ)
                         {
-                            creationCtx.Interface.pfnGetRoots        = sharedClipboardSvcURIGetRoots;
-                            creationCtx.Interface.pfnListHdrRead     = sharedClipboardSvcURIListHdrRead;
-                            creationCtx.Interface.pfnListEntryRead   = sharedClipboardSvcURIListEntryRead;
-                            creationCtx.Interface.pfnObjRead         = sharedClipboardSvcURIObjRead;
+                            creationCtx.Interface.pfnGetRoots        = sharedClipboardSvcTransferGetRoots;
+                            creationCtx.Interface.pfnListHdrRead     = sharedClipboardSvcTransferListHdrRead;
+                            creationCtx.Interface.pfnListEntryRead   = sharedClipboardSvcTransferListEntryRead;
+                            creationCtx.Interface.pfnObjRead         = sharedClipboardSvcTransferObjRead;
                         }
                         else
@@ -1388 +1388 @@
 
                         /* Register needed callbacks so that we can wait for the meta data to arrive here. */
-                        SHCLURITRANSFERCALLBACKS Callbacks;
+                        SHCLTRANSFERCALLBACKS Callbacks;
                         RT_ZERO(Callbacks);
 
                         Callbacks.pvUser                = pClient;
 
-                        Callbacks.pfnTransferPrepare    = VBoxSvcClipboardURITransferPrepareCallback;
-                        Callbacks.pfnTransferComplete   = VBoxSvcClipboardURITransferCompleteCallback;
-                        Callbacks.pfnTransferCanceled   = VBoxSvcClipboardURITransferCanceledCallback;
-                        Callbacks.pfnTransferError      = VBoxSvcClipboardURITransferErrorCallback;
-
-                        SharedClipboardURITransferSetCallbacks(pTransfer, &Callbacks);
-
-                        rc = SharedClipboardURITransferSetInterface(pTransfer, &creationCtx);
+                        Callbacks.pfnTransferPrepare    = VBoxSvcClipboardTransferPrepareCallback;
+                        Callbacks.pfnTransferComplete   = VBoxSvcClipboardTransferCompleteCallback;
+                        Callbacks.pfnTransferCanceled   = VBoxSvcClipboardTransferCanceledCallback;
+                        Callbacks.pfnTransferError      = VBoxSvcClipboardTransferErrorCallback;
+
+                        SharedClipboardTransferSetCallbacks(pTransfer, &Callbacks);
+
+                        rc = SharedClipboardTransferSetInterface(pTransfer, &creationCtx);
                         if (RT_SUCCESS(rc))
-                            rc = SharedClipboardURICtxTransferAdd(&pClient->URI, pTransfer);
+                            rc = SharedClipboardTransferCtxTransferAdd(&pClient->URI, pTransfer);
                     }
 
                     if (RT_SUCCESS(rc))
                     {
-                        rc = SharedClipboardSvcImplURITransferCreate(pClient, pTransfer);
+                        rc = SharedClipboardSvcImplTransferCreate(pClient, pTransfer);
                         if (RT_SUCCESS(rc))
                             rc = SharedClipboardSvcImplFormatAnnounce(pClient, VBOX_SHCL_FMT_URI_LIST);
@@ -1414 +1414 @@
                     if (RT_FAILURE(rc))
                     {
-                        SharedClipboardSvcImplURITransferDestroy(pClient, pTransfer);
-                        SharedClipboardURITransferDestroy(pTransfer);
+                        SharedClipboardSvcImplTransferDestroy(pClient, pTransfer);
+                        SharedClipboardTransferDestroy(pTransfer);
                     }
                 }
@@ -1431 +1431 @@
         case VBOX_SHCL_GUEST_FN_REPLY:
         {
-            rc = sharedClipboardSvcURITransferHandleReply(pClient, pTransfer, cParms, paParms);
+            rc = sharedClipboardSvcTransferTransferHandleReply(pClient, pTransfer, cParms, paParms);
 
             /* This message does not need any completion, as it can happen at any time from the guest side. */
@@ -1446 +1446 @@
         {
             SHCLROOTLISTHDR lstHdr;
-            rc = sharedClipboardSvcURIGetRootListHdr(cParms, paParms, &lstHdr);
-            if (RT_SUCCESS(rc))
-            {
-                void    *pvData = SharedClipboardURIRootListHdrDup(&lstHdr);
+            rc = sharedClipboardSvcTransferGetRootListHdr(cParms, paParms, &lstHdr);
+            if (RT_SUCCESS(rc))
+            {
+                void    *pvData = SharedClipboardTransferRootListHdrDup(&lstHdr);
                 uint32_t cbData = sizeof(SHCLROOTLISTHDR);
 
@@ -1470 +1470 @@
     #if 0
             SHCLROOTLISTENTRY lstEntry;
-            rc = VBoxSvcClipboardURIGetRootListEntry(cParms, paParms, &lstEntry);
-            if (RT_SUCCESS(rc))
-            {
-                void    *pvData = SharedClipboardURIRootListEntryDup(&lstEntry);
+            rc = VBoxSvcClipboardGetRootListEntry(cParms, paParms, &lstEntry);
+            if (RT_SUCCESS(rc))
+            {
+                void    *pvData = SharedClipboardTransferRootListEntryDup(&lstEntry);
                 uint32_t cbData = sizeof(SHCLROOTLISTENTRY);
 
-                PSHCLURITRANSFERPAYLOAD pPayload;
-                rc = SharedClipboardURITransferPayloadAlloc(SHCLURITRANSFEREVENTTYPE_ROOT_LIST_HDR_READ,
+                PSHCLTRANSFERPAYLOAD pPayload;
+                rc = SharedClipboardTransferPayloadAlloc(SHCLTRANSFEREVENTTYPE_ROOT_LIST_HDR_READ,
                                                             pvData, cbData, &pPayload);
                 if (RT_SUCCESS(rc))
-                    rc = SharedClipboardURITransferEventSignal(pTransfer, SHCLURITRANSFEREVENTTYPE_ROOT_LIST_HDR_READ,
-                                                               pPayload);
+                    rc = SharedClipboardTransferEventSignal(pTransfer, SHCLTRANSFEREVENTTYPE_ROOT_LIST_HDR_READ,
+                                                            pPayload);
             }
             break;
@@ -1490 +1490 @@
         {
             SHCLROOTLISTENTRY lstEntry;
-            rc = sharedClipboardSvcURIGetRootListEntry(cParms, paParms, &lstEntry);
-            if (RT_SUCCESS(rc))
-            {
-                void    *pvData = SharedClipboardURIRootListEntryDup(&lstEntry);
+            rc = sharedClipboardSvcTransferGetRootListEntry(cParms, paParms, &lstEntry);
+            if (RT_SUCCESS(rc))
+            {
+                void    *pvData = SharedClipboardTransferRootListEntryDup(&lstEntry);
                 uint32_t cbData = sizeof(SHCLROOTLISTENTRY);
 
@@ -1513 +1513 @@
         {
             SHCLLISTOPENPARMS listOpenParms;
-            rc = sharedClipboardSvcURIGetListOpen(cParms, paParms, &listOpenParms);
+            rc = sharedClipboardSvcTransferGetListOpen(cParms, paParms, &listOpenParms);
             if (RT_SUCCESS(rc))
             {
                 SHCLLISTHANDLE hList;
-                rc = SharedClipboardURITransferListOpen(pTransfer, &listOpenParms, &hList);
+                rc = SharedClipboardTransferListOpen(pTransfer, &listOpenParms, &hList);
                 if (RT_SUCCESS(rc))
                 {
@@ -1536 +1536 @@
             if (RT_SUCCESS(rc))
             {
-                rc = SharedClipboardURITransferListClose(pTransfer, hList);
+                rc = SharedClipboardTransferListClose(pTransfer, hList);
             }
             break;
@@ -1551 +1551 @@
             {
                 SHCLLISTHDR hdrList;
-                rc = SharedClipboardURITransferListGetHeader(pTransfer, hList, &hdrList);
+                rc = SharedClipboardTransferListGetHeader(pTransfer, hList, &hdrList);
                 /*if (RT_SUCCESS(rc))
-                    rc = sharedClipboardSvcURISetListHdr(cParms, paParms, &hdrList);*/
+                    rc = sharedClipboardSvcTransferSetListHdr(cParms, paParms, &hdrList);*/
             }
             break;
@@ -1561 +1561 @@
         {
             SHCLLISTHDR hdrList;
-            rc = SharedClipboardURIListHdrInit(&hdrList);
+            rc = SharedClipboardTransferListHdrInit(&hdrList);
             if (RT_SUCCESS(rc))
             {
                 SHCLLISTHANDLE hList;
-                rc = sharedClipboardSvcURIGetListHdr(cParms, paParms, &hList, &hdrList);
+                rc = sharedClipboardSvcTransferGetListHdr(cParms, paParms, &hList, &hdrList);
                 if (RT_SUCCESS(rc))
                 {
-                    void    *pvData = SharedClipboardURIListHdrDup(&hdrList);
+                    void    *pvData = SharedClipboardTransferListHdrDup(&hdrList);
                     uint32_t cbData = sizeof(SHCLLISTHDR);
 
@@ -1596 +1596 @@
             {
                 SHCLLISTENTRY entryList;
-                rc = SharedClipboardURITransferListRead(pTransfer, hList, &entryList);
+                rc = SharedClipboardTransferListRead(pTransfer, hList, &entryList);
             }
             break;
@@ -1604 +1604 @@
         {
             SHCLLISTENTRY entryList;
-            rc = SharedClipboardURIListEntryInit(&entryList);
+            rc = SharedClipboardTransferListEntryInit(&entryList);
             if (RT_SUCCESS(rc))
             {
                 SHCLLISTHANDLE hList;
-                rc = sharedClipboardSvcURIGetListEntry(cParms, paParms, &hList, &entryList);
+                rc = sharedClipboardSvcTransferGetListEntry(cParms, paParms, &hList, &entryList);
                 if (RT_SUCCESS(rc))
                 {
-                    void    *pvData = SharedClipboardURIListEntryDup(&entryList);
+                    void    *pvData = SharedClipboardTransferListEntryDup(&entryList);
                     uint32_t cbData = sizeof(SHCLLISTENTRY);
 
@@ -1649 +1649 @@
         {
             SHCLOBJDATACHUNK dataChunk;
-            rc = sharedClipboardSvcURIGetObjDataChunk(cParms, paParms, &dataChunk);
-            if (RT_SUCCESS(rc))
-            {
-                void    *pvData = SharedClipboardURIObjectDataChunkDup(&dataChunk);
+            rc = sharedClipboardSvcTransferGetObjDataChunk(cParms, paParms, &dataChunk);
+            if (RT_SUCCESS(rc))
+            {
+                void    *pvData = SharedClipboardTransferObjectDataChunkDup(&dataChunk);
                 uint32_t cbData = sizeof(SHCLOBJDATACHUNK);
 
@@ -1676 +1676 @@
 
             SHCLDIRDATA dirData;
-            rc = VBoxSvcClipboardURIGetDir(cParms, paParms, &dirData);
-            if (RT_SUCCESS(rc))
-            {
-                SharedClipboardArea *pArea = SharedClipboardURITransferGetArea(pTransfer);
+            rc = VBoxSvcClipboardGetDir(cParms, paParms, &dirData);
+            if (RT_SUCCESS(rc))
+            {
+                SharedClipboardArea *pArea = SharedClipboardTransferGetArea(pTransfer);
                 AssertPtrBreakStmt(pArea, rc = VERR_INVALID_POINTER);
 
@@ -1709 +1709 @@
 
             SHCLFILEHDR fileHdr;
-            rc = VBoxSvcClipboardURISetFileHdr(cParms, paParms, &fileHdr);
+            rc = VBoxSvcClipboardSetFileHdr(cParms, paParms, &fileHdr);
             break;
         }
@@ -1717 +1717 @@
             LogFlowFunc(("VBOX_SHCL_GUEST_FN_WRITE_FILE_HDR\n"));
 
-            if (!SharedClipboardURIObjCtxIsValid(SharedClipboardURITransferGetCurrentObjCtx(pTransfer)))
-            {
-                pTransfer->State.ObjCtx.pObj = new SharedClipboardURIObject(SharedClipboardURIObject::Type_File);
+            if (!SharedClipboardTransferObjCtxIsValid(SharedClipboardTransferGetCurrentObjCtx(pTransfer)))
+            {
+                pTransfer->State.ObjCtx.pObj = new SharedClipboardTransferObject(SharedClipboardTransferObject::Type_File);
                 if (pTransfer->State.ObjCtx.pObj) /** @todo Can this throw? */
                 {
@@ -1734 +1734 @@
 
             SHCLFILEHDR fileHdr;
-            rc = VBoxSvcClipboardURIGetFileHdr(cParms, paParms, &fileHdr);
-            if (RT_SUCCESS(rc))
-            {
-                SharedClipboardArea *pArea = SharedClipboardURITransferGetArea(pTransfer);
+            rc = VBoxSvcClipboardGetFileHdr(cParms, paParms, &fileHdr);
+            if (RT_SUCCESS(rc))
+            {
+                SharedClipboardArea *pArea = SharedClipboardTransferGetArea(pTransfer);
                 AssertPtrBreakStmt(pArea, rc = VERR_WRONG_ORDER);
 
@@ -1749 +1749 @@
                     if (RT_SUCCESS(rc))
                     {
-                        PSHCLCLIENTURIOBJCTX pObjCtx = SharedClipboardURITransferGetCurrentObjCtx(pTransfer);
+                        PSHCLCLIENTTRANSFEROBJCTX pObjCtx = SharedClipboardTransferGetCurrentObjCtx(pTransfer);
                         AssertPtrBreakStmt(pObjCtx, VERR_INVALID_POINTER);
 
-                        SharedClipboardURIObject *pObj = pObjCtx->pObj;
+                        SharedClipboardTransferObject *pObj = pObjCtx->pObj;
                         AssertPtrBreakStmt(pObj, VERR_INVALID_POINTER);
 
@@ -1758 +1758 @@
 
                         /** @todo Add sparse file support based on fFlags? (Use Open(..., fFlags | SPARSE). */
-                        rc = pObj->OpenFileEx(pszPathAbs, SharedClipboardURIObject::View_Target,
+                        rc = pObj->OpenFileEx(pszPathAbs, SharedClipboardTransferObject::View_Target,
                                               RTFILE_O_CREATE_REPLACE | RTFILE_O_WRITE | RTFILE_O_DENY_WRITE,
                                               (fileHdr.fMode & RTFS_UNIX_MASK) | RTFS_UNIX_IRUSR | RTFS_UNIX_IWUSR);
@@ -1775 +1775 @@
                                          pObj->GetDestPathAbs().c_str()));
 
-                                SharedClipboardURIObjCtxDestroy(&pTransfer->State.ObjCtx);
+                                SharedClipboardTransferObjCtxDestroy(&pTransfer->State.ObjCtx);
                             }
 
@@ -1795 +1795 @@
 
             SHCLFILEDATA fileData;
-            rc = VBoxSvcClipboardURISetFileData(cParms, paParms, &fileData);
+            rc = VBoxSvcClipboardSetFileData(cParms, paParms, &fileData);
             break;
         }
@@ -1803 +1803 @@
             LogFlowFunc(("VBOX_SHCL_FN_WRITE_FILE_DATA\n"));
 
-            if (!SharedClipboardURIObjCtxIsValid(&pTransfer->State.ObjCtx))
+            if (!SharedClipboardTransferObjCtxIsValid(&pTransfer->State.ObjCtx))
             {
                 rc = VERR_WRONG_ORDER;
@@ -1810 +1810 @@
 
             SHCLFILEDATA fileData;
-            rc = VBoxSvcClipboardURIGetFileData(cParms, paParms, &fileData);
-            if (RT_SUCCESS(rc))
-            {
-                PSHCLCLIENTURIOBJCTX pObjCtx = SharedClipboardURITransferGetCurrentObjCtx(pTransfer);
+            rc = VBoxSvcClipboardGetFileData(cParms, paParms, &fileData);
+            if (RT_SUCCESS(rc))
+            {
+                PSHCLCLIENTTRANSFEROBJCTX pObjCtx = SharedClipboardTransferGetCurrentObjCtx(pTransfer);
                 AssertPtrBreakStmt(pObjCtx, VERR_INVALID_POINTER);
 
-                SharedClipboardURIObject *pObj = pObjCtx->pObj;
+                SharedClipboardTransferObject *pObj = pObjCtx->pObj;
                 AssertPtrBreakStmt(pObj, VERR_INVALID_POINTER);
 
@@ -1832 +1832 @@
                     if (   pObj->IsComplete()
                         || RT_FAILURE(rc))
-                        SharedClipboardURIObjCtxDestroy(&pTransfer->State.ObjCtx);
+                        SharedClipboardTransferObjCtxDestroy(&pTransfer->State.ObjCtx);
                 }
                 else
@@ -1849 +1849 @@
         {
             int rcGuest;
-            rc = sharedClipboardSvcURIGetError(cParms,paParms, &rcGuest);
+            rc = sharedClipboardSvcTransferGetError(cParms,paParms, &rcGuest);
             if (RT_SUCCESS(rc))
                 LogRel(("Shared Clipboard: Transfer error: %Rrc\n", rcGuest));
@@ -1873 +1873 @@
 
 /**
- * URI host handler for the Shared Clipboard host service.
+ * transfer host handler for the Shared Clipboard host service.
  *
  * @returns VBox status code.
@@ -1880 +1880 @@
  * @param   paParms             Array function parameters  supplied.
  */
-int sharedClipboardSvcURIHostHandler(uint32_t u32Function,
-                                   uint32_t cParms,
-                                   VBOXHGCMSVCPARM paParms[])
+int sharedClipboardSvcTransferHostHandler(uint32_t u32Function,
+                                          uint32_t cParms,
+                                          VBOXHGCMSVCPARM paParms[])
 {
     RT_NOREF(cParms, paParms);
@@ -1906 +1906 @@
 
 /**
- * Registers an URI clipboard area.
+ * Registers an clipboard transfer area.
  *
  * @returns VBox status code.
  * @param   pClientState        Client state to use.
- * @param   pTransfer           URI transfer to register a clipboard area for.
+ * @param   pTransfer           Shared Clipboard transfer to register a clipboard area for.
  */
-int sharedClipboardSvcURIAreaRegister(PSHCLCLIENTSTATE pClientState, PSHCLURITRANSFER pTransfer)
+int sharedClipboardSvcTransferAreaRegister(PSHCLCLIENTSTATE pClientState, PSHCLTRANSFER pTransfer)
 {
     RT_NOREF(pClientState);
@@ -1955 +1955 @@
 
 /**
- * Unregisters an URI clipboard area.
+ * Unregisters an clipboard transfer area.
  *
  * @returns VBox status code.
  * @param   pClientState        Client state to use.
- * @param   pTransfer           URI transfer to unregister a clipboard area from.
+ * @param   pTransfer           Shared Clipboard transfer to unregister a clipboard area from.
  */
-int sharedClipboardSvcURIAreaUnregister(PSHCLCLIENTSTATE pClientState, PSHCLURITRANSFER pTransfer)
+int sharedClipboardSvcTransferAreaUnregister(PSHCLCLIENTSTATE pClientState, PSHCLTRANSFER pTransfer)
 {
     RT_NOREF(pClientState);
@@ -2002 +2002 @@
 
 /**
- * Attaches to an existing (registered) URI clipboard area.
+ * Attaches to an existing (registered) clipboard transfer area.
  *
  * @returns VBox status code.
  * @param   pClientState        Client state to use.
- * @param   pTransfer           URI transfer to attach a clipboard area to.
+ * @param   pTransfer           Shared Clipboard transfer to attach a clipboard area to.
  * @param   uID                 ID of clipboard area to to attach to. Specify 0 to attach to the most recent one.
  */
-int sharedClipboardSvcURIAreaAttach(PSHCLCLIENTSTATE pClientState, PSHCLURITRANSFER pTransfer,
-                                  SHCLAREAID uID)
+int sharedClipboardSvcTransferAreaAttach(PSHCLCLIENTSTATE pClientState, PSHCLTRANSFER pTransfer,
+                                         SHCLAREAID uID)
 {
     RT_NOREF(pClientState);
@@ -2051 +2051 @@
 
 /**
- * Detaches from an URI clipboard area.
+ * Detaches from an clipboard transfer area.
  *
  * @returns VBox status code.
  * @param   pClientState        Client state to use.
- * @param   pTransfer           URI transfer to detach a clipboard area from.
+ * @param   pTransfer           Shared Clipboard transfer to detach a clipboard area from.
  */
-int sharedClipboardSvcURIAreaDetach(PSHCLCLIENTSTATE pClientState, PSHCLURITRANSFER pTransfer)
+int sharedClipboardSvcTransferAreaDetach(PSHCLCLIENTSTATE pClientState, PSHCLTRANSFER pTransfer)
 {
     RT_NOREF(pClientState);
@@ -2099 +2099 @@
  * @param   puEvent             Where to store the created wait event. Optional.
  */
-int sharedClipboardSvcURITransferSendStatus(PSHCLCLIENT pClient, PSHCLURITRANSFER pTransfer, SHCLURITRANSFERSTATUS uStatus,
-                                            int rcTransfer, PSHCLEVENTID puEvent)
+int sharedClipboardSvcTransferTransferSendStatus(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer, SHCLTRANSFERSTATUS uStatus,
+                                                 int rcTransfer, PSHCLEVENTID puEvent)
 {
     AssertPtrReturn(pClient,   VERR_INVALID_POINTER);
@@ -2106 +2106 @@
     /* puEvent is optional. */
 
-    PSHCLCLIENTMSG pMsgReadData = sharedClipboardSvcMsgAlloc(VBOX_SHCL_HOST_MSG_URI_TRANSFER_STATUS,
+    PSHCLCLIENTMSG pMsgReadData = sharedClipboardSvcMsgAlloc(VBOX_SHCL_HOST_MSG_TRANSFER_TRANSFER_STATUS,
                                                              VBOX_SHCL_CPARMS_TRANSFER_STATUS);
     if (!pMsgReadData)
@@ -2153 +2153 @@
  * @param   ppTransfer          Where to return the created transfer on success. Optional.
  */
-int sharedClipboardSvcURITransferStart(PSHCLCLIENT pClient,
-                                       SHCLURITRANSFERDIR enmDir, SHCLSOURCE enmSource,
-                                       PSHCLURITRANSFER *ppTransfer)
+int sharedClipboardSvcTransferTransferStart(PSHCLCLIENT pClient,
+                                            SHCLTRANSFERDIR enmDir, SHCLSOURCE enmSource,
+                                            PSHCLTRANSFER *ppTransfer)
 {
     AssertPtrReturn(pClient, VERR_INVALID_POINTER);
@@ -2162 +2162 @@
     LogFlowFuncEnter();
 
-    SharedClipboardURICtxTransfersCleanup(&pClient->URI);
+    SharedClipboardTransferCtxTransfersCleanup(&pClient->TransferCtx);
 
     int rc;
 
-    if (!SharedClipboardURICtxTransfersMaximumReached(&pClient->URI))
-    {
-        LogRel2(("Shared Clipboard: Starting %s transfer ...\n", enmDir == SHCLURITRANSFERDIR_READ ? "read" : "write"));
-
-        PSHCLURITRANSFER pTransfer;
-        rc = SharedClipboardURITransferCreate(&pTransfer);
+    if (!SharedClipboardTransferCtxTransfersMaximumReached(&pClient->TransferCtx))
+    {
+        LogRel2(("Shared Clipboard: Starting %s transfer ...\n", enmDir == SHCLTRANSFERDIR_READ ? "read" : "write"));
+
+        PSHCLTRANSFER pTransfer;
+        rc = SharedClipboardTransferCreate(&pTransfer);
         if (RT_SUCCESS(rc))
         {
@@ -2177 +2177 @@
             RT_ZERO(creationCtx);
 
-            if (enmDir == SHCLURITRANSFERDIR_READ)
-            {
-                rc = sharedClipboardSvcURIAreaRegister(&pClient->State, pTransfer);
+            if (enmDir == SHCLTRANSFERDIR_READ)
+            {
+                rc = sharedClipboardSvcTransferAreaRegister(&pClient->State, pTransfer);
                 if (RT_SUCCESS(rc))
                 {
-                    creationCtx.Interface.pfnTransferOpen    = sharedClipboardSvcURITransferOpen;
-                    creationCtx.Interface.pfnTransferClose   = sharedClipboardSvcURITransferClose;
-                    creationCtx.Interface.pfnListOpen        = sharedClipboardSvcURIListOpen;
-                    creationCtx.Interface.pfnListClose       = sharedClipboardSvcURIListClose;
-                    creationCtx.Interface.pfnObjOpen         = sharedClipboardSvcURIObjOpen;
-                    creationCtx.Interface.pfnObjClose        = sharedClipboardSvcURIObjClose;
-
-                    creationCtx.Interface.pfnGetRoots        = sharedClipboardSvcURIGetRoots;
-                    creationCtx.Interface.pfnListHdrRead     = sharedClipboardSvcURIListHdrRead;
-                    creationCtx.Interface.pfnListEntryRead   = sharedClipboardSvcURIListEntryRead;
-                    creationCtx.Interface.pfnObjRead         = sharedClipboardSvcURIObjRead;
-                }
-            }
-            else if (enmDir == SHCLURITRANSFERDIR_WRITE)
-            {
-                creationCtx.Interface.pfnListHdrWrite   = sharedClipboardSvcURIListHdrWrite;
-                creationCtx.Interface.pfnListEntryWrite = sharedClipboardSvcURIListEntryWrite;
-                creationCtx.Interface.pfnObjWrite       = sharedClipboardSvcURIObjWrite;
+                    creationCtx.Interface.pfnTransferOpen    = sharedClipboardSvcTransferTransferOpen;
+                    creationCtx.Interface.pfnTransferClose   = sharedClipboardSvcTransferTransferClose;
+                    creationCtx.Interface.pfnListOpen        = sharedClipboardSvcTransferListOpen;
+                    creationCtx.Interface.pfnListClose       = sharedClipboardSvcTransferListClose;
+                    creationCtx.Interface.pfnObjOpen         = sharedClipboardSvcTransferObjOpen;
+                    creationCtx.Interface.pfnObjClose        = sharedClipboardSvcTransferObjClose;
+
+                    creationCtx.Interface.pfnGetRoots        = sharedClipboardSvcTransferGetRoots;
+                    creationCtx.Interface.pfnListHdrRead     = sharedClipboardSvcTransferListHdrRead;
+                    creationCtx.Interface.pfnListEntryRead   = sharedClipboardSvcTransferListEntryRead;
+                    creationCtx.Interface.pfnObjRead         = sharedClipboardSvcTransferObjRead;
+                }
+            }
+            else if (enmDir == SHCLTRANSFERDIR_WRITE)
+            {
+                creationCtx.Interface.pfnListHdrWrite   = sharedClipboardSvcTransferListHdrWrite;
+                creationCtx.Interface.pfnListEntryWrite = sharedClipboardSvcTransferListEntryWrite;
+                creationCtx.Interface.pfnObjWrite       = sharedClipboardSvcTransferObjWrite;
             }
             else
@@ -2208 +2208 @@
 
             /* Register needed callbacks so that we can wait for the meta data to arrive here. */
-            SHCLURITRANSFERCALLBACKS Callbacks;
+            SHCLTRANSFERCALLBACKS Callbacks;
             RT_ZERO(Callbacks);
 
             Callbacks.pvUser                = pClient;
 
-            Callbacks.pfnTransferPrepare    = VBoxSvcClipboardURITransferPrepareCallback;
-            Callbacks.pfnTransferComplete   = VBoxSvcClipboardURITransferCompleteCallback;
-            Callbacks.pfnTransferCanceled   = VBoxSvcClipboardURITransferCanceledCallback;
-            Callbacks.pfnTransferError      = VBoxSvcClipboardURITransferErrorCallback;
-
-            SharedClipboardURITransferSetCallbacks(pTransfer, &Callbacks);
+            Callbacks.pfnTransferPrepare    = VBoxSvcClipboardTransferPrepareCallback;
+            Callbacks.pfnTransferComplete   = VBoxSvcClipboardTransferCompleteCallback;
+            Callbacks.pfnTransferCanceled   = VBoxSvcClipboardTransferCanceledCallback;
+            Callbacks.pfnTransferError      = VBoxSvcClipboardTransferErrorCallback;
+
+            SharedClipboardTransferSetCallbacks(pTransfer, &Callbacks);
 
             uint32_t uTransferID = 0;
 
-            rc = SharedClipboardURITransferSetInterface(pTransfer, &creationCtx);
-            if (RT_SUCCESS(rc))
-            {
-                rc = SharedClipboardSvcImplURITransferCreate(pClient, pTransfer);
+            rc = SharedClipboardTransferSetInterface(pTransfer, &creationCtx);
+            if (RT_SUCCESS(rc))
+            {
+                rc = SharedClipboardSvcImplTransferCreate(pClient, pTransfer);
                 if (RT_SUCCESS(rc))
                 {
-                    rc = SharedClipboardURICtxTransferRegister(&pClient->URI, pTransfer, &uTransferID);
+                    rc = SharedClipboardTransferCtxTransferRegister(&pClient->TransferCtx, pTransfer, &uTransferID);
                     if (RT_SUCCESS(rc))
                     {
-                        rc = SharedClipboardURITransferInit(pTransfer, uTransferID, enmDir, enmSource);
+                        rc = SharedClipboardTransferInit(pTransfer, uTransferID, enmDir, enmSource);
                         if (RT_SUCCESS(rc))
                         {
                             SHCLEVENTID uEvent;
-                            rc = sharedClipboardSvcURITransferSendStatus(pClient, pTransfer,
-                                                                         SHCLURITRANSFERSTATUS_READY, VINF_SUCCESS,
-                                                                         &uEvent);
+                            rc = sharedClipboardSvcTransferTransferSendStatus(pClient, pTransfer,
+                                                                              SHCLTRANSFERSTATUS_READY, VINF_SUCCESS,
+                                                                              &uEvent);
                             if (RT_SUCCESS(rc))
                             {
@@ -2273 +2273 @@
             if (RT_FAILURE(rc))
             {
-                SharedClipboardURICtxTransferUnregister(&pClient->URI, uTransferID);
-
-                SharedClipboardURITransferDestroy(pTransfer);
+                SharedClipboardTransferCtxTransferUnregister(&pClient->TransferCtx, uTransferID);
+
+                SharedClipboardTransferDestroy(pTransfer);
 
                 RTMemFree(pTransfer);
@@ -2304 +2304 @@
  * @param   pTransfer           Transfer to stop.
  */
-int sharedClipboardSvcURITransferStop(PSHCLCLIENT pClient, PSHCLURITRANSFER pTransfer)
-{
-    int rc = SharedClipboardURITransferClose(pTransfer);
+int sharedClipboardSvcTransferTransferStop(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer)
+{
+    int rc = SharedClipboardTransferClose(pTransfer);
     if (RT_SUCCESS(rc))
     {
         SHCLEVENTID uEvent;
-        rc = sharedClipboardSvcURITransferSendStatus(pClient, pTransfer,
-                                                     SHCLURITRANSFERSTATUS_STOPPED, VINF_SUCCESS,
-                                                     &uEvent);
+        rc = sharedClipboardSvcTransferTransferSendStatus(pClient, pTransfer,
+                                                          SHCLTRANSFERSTATUS_STOPPED, VINF_SUCCESS,
+                                                          &uEvent);
         if (RT_SUCCESS(rc))
         {
@@ -2320 +2320 @@
             if (RT_SUCCESS(rc))
             {
-                rc = SharedClipboardURICtxTransferUnregister(&pClient->URI, SharedClipboardURITransferGetID(pTransfer));
+                rc = SharedClipboardTransferCtxTransferUnregister(&pClient->TransferCtx, SharedClipboardTransferGetID(pTransfer));
 
                 LogRel2(("Shared Clipboard: Stopped transfer %RU32 on guest\n", pTransfer->State.uID));

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

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * Shared Clipboard Service - Internal header for URI (list) handling.
+ * Shared Clipboard Service - Internal header for transfer (list) handling.
  */
 
@@ -22 +22 @@
 #endif
 
-int sharedClipboardSvcURIHandler(PSHCLCLIENT pClient, VBOXHGCMCALLHANDLE callHandle, uint32_t u32Function, uint32_t cParms, VBOXHGCMSVCPARM paParms[], uint64_t tsArrival);
-int sharedClipboardSvcURIHostHandler(uint32_t u32Function, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
+int sharedClipboardSvcTransferHandler(PSHCLCLIENT pClient, VBOXHGCMCALLHANDLE callHandle, uint32_t u32Function, uint32_t cParms, VBOXHGCMSVCPARM paParms[], uint64_t tsArrival);
+int sharedClipboardSvcTransferHostHandler(uint32_t u32Function, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
 
-int sharedClipboardSvcURIAreaRegister(PSHCLCLIENTSTATE pClientState, PSHCLURITRANSFER pTransfer);
-int sharedClipboardSvcURIAreaUnregister(PSHCLCLIENTSTATE pClientState, PSHCLURITRANSFER pTransfer);
-int sharedClipboardSvcURIAreaAttach(PSHCLCLIENTSTATE pClientState, PSHCLURITRANSFER pTransfer, SHCLAREAID uID);
-int sharedClipboardSvcURIAreaDetach(PSHCLCLIENTSTATE pClientState, PSHCLURITRANSFER pTransfer);
+int sharedClipboardSvcTransferAreaRegister(PSHCLCLIENTSTATE pClientState, PSHCLTRANSFER pTransfer);
+int sharedClipboardSvcTransferAreaUnregister(PSHCLCLIENTSTATE pClientState, PSHCLTRANSFER pTransfer);
+int sharedClipboardSvcTransferAreaAttach(PSHCLCLIENTSTATE pClientState, PSHCLTRANSFER pTransfer, SHCLAREAID uID);
+int sharedClipboardSvcTransferAreaDetach(PSHCLCLIENTSTATE pClientState, PSHCLTRANSFER pTransfer);
 
 #endif /* !VBOX_INCLUDED_SRC_SharedClipboard_VBoxSharedClipboardSvc_uri_h */

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

@@ -101 +101 @@
     switch (uMsg)
     {
-        case VBOX_SHCL_HOST_MSG_URI_TRANSFER_START:
+        case VBOX_SHCL_HOST_MSG_TRANSFER_TRANSFER_START:
         {
             Assert(pClient->State.URI.fTransferStart == false);
 
-            LogFlowFunc(("VBOX_SHCL_HOST_MSG_URI_TRANSFER_START\n"));
+            LogFlowFunc(("VBOX_SHCL_HOST_MSG_TRANSFER_TRANSFER_START\n"));
 
             if (   sharedClipboardSvcGetMode() != VBOX_SHCL_MODE_HOST_TO_GUEST
@@ -115 +115 @@
 
             pClient->State.URI.fTransferStart = true;
-            pClient->State.URI.enmTransferDir = (SHCLURITRANSFERDIR)uParm;
+            pClient->State.URI.enmTransferDir = (SHCLTRANSFERDIR)uParm;
             break;
 
@@ -130 +130 @@
 }
 
-bool sharedClipboardSvcURIReturnMsg(PSHCLCLIENT pClient, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
+bool sharedClipboardSvcTransferReturnMsg(PSHCLCLIENT pClient, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
 {
     RT_NOREF(pClient, cParms, paParms);
@@ -139 +139 @@
         && cParms >= 2)
     {
-        HGCMSvcSetU32(&paParms[0], VBOX_SHCL_HOST_MSG_URI_TRANSFER_START);
+        HGCMSvcSetU32(&paParms[0], VBOX_SHCL_HOST_MSG_TRANSFER_TRANSFER_START);
         HGCMSvcSetU32(&paParms[1], pClient->State.URI.enmTransferDir);
         pClient->State.URI.fTransferStart = false;

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

@@ -339 +339 @@
             if (fFormats & VBOX_SHCL_FMT_URI_LIST)
             {
-                PSHCLURITRANSFER pTransfer;
-                int rc = sharedClipboardSvcURITransferStart(pCtx->pClient,
-                                                            SHCLURITRANSFERDIR_READ, SHCLSOURCE_REMOTE,
-                                                            &pTransfer);
+                PSHCLTRANSFER pTransfer;
+                int rc = sharedClipboardSvcTransferTransferStart(pCtx->pClient,
+                                                                 SHCLTRANSFERDIR_READ, SHCLSOURCE_REMOTE,
+                                                                 &pTransfer);
                 if (RT_SUCCESS(rc))
                 {
                     /* Create the IDataObject implementation the host OS needs and assign
                      * the newly created transfer to this object. */
-                    rc = SharedClipboardWinURITransferCreate(&pCtx->Win, pTransfer);
+                    rc = SharedClipboardWinTransferCreate(&pCtx->Win, pTransfer);
 
                     /*  Note: The actual requesting + retrieving of data will be done in the IDataObject implementation
@@ -843 +843 @@
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-int SharedClipboardSvcImplURITransferCreate(PSHCLCLIENT pClient, PSHCLURITRANSFER pTransfer)
+int SharedClipboardSvcImplTransferCreate(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer)
 {
     RT_NOREF(pClient, pTransfer);
@@ -852 +852 @@
 }
 
-int SharedClipboardSvcImplURITransferDestroy(PSHCLCLIENT pClient, PSHCLURITRANSFER pTransfer)
+int SharedClipboardSvcImplTransferDestroy(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer)
 {
     LogFlowFuncEnter();
 
-    SharedClipboardWinURITransferDestroy(&pClient->State.pCtx->Win, pTransfer);
+    SharedClipboardWinTransferDestroy(&pClient->State.pCtx->Win, pTransfer);
 
     return VINF_SUCCESS;

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

@@ -205 +205 @@
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-    if (pFormats->uFormats & VBOX_SHCL_FMT_URI_LIST) /* No URI support yet. */
+    if (pFormats->uFormats & VBOX_SHCL_FMT_URI_LIST) /* No transfer support yet. */
         return VINF_SUCCESS;
 #endif
@@ -390 +390 @@
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-int SharedClipboardSvcImplURITransferCreate(PSHCLCLIENT pClient, PSHCLURITRANSFER pTransfer)
+int SharedClipboardSvcImplTransferCreate(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer)
 {
     RT_NOREF(pClient, pTransfer);
@@ -396 +396 @@
 }
 
-int SharedClipboardSvcImplURITransferDestroy(PSHCLCLIENT pClient, PSHCLURITRANSFER pTransfer)
+int SharedClipboardSvcImplTransferDestroy(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer)
 {
     RT_NOREF(pClient, pTransfer);

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

@@ -85 +85 @@
  * Since VBox x.x.x transferring files via Shared Clipboard is supported.
  * See the VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS define for supported / enabled
- * platforms. This is called "URI transfers".
+ * platforms. This is called "Shared Clipboard transfers".
  *
  * Copying files / directories from guest A to guest B requires the host
@@ -103 +103 @@
  * - No (maybe never) support for NT4.
  *
- * @section sec_uri_areas               Clipboard areas.
+ * @section sec_transfers_areas         Clipboard areas.
  *
  * For larger / longer transfers there might be file data
@@ -123 +123 @@
  *       host's file system directly?
  *
- * @section sec_uri_structure           URI handling structure
+ * @section sec_transfer_structure        Transfer handling structure
  *
  * All structures / classes are designed for running on both, on the guest
@@ -129 +129 @@
  * duplication where applicable.
  *
- * Per HGCM client there is a so-called "URI context", which in turn can have
- * one or mulitple so-called "URI transfer" objects. At the moment we only support
- * on concurrent URI transfer per URI context. It's being used for reading from a
- * source or writing to destination, depening on its direction. An URI transfer
+ * Per HGCM client there is a so-called "transfer context", which in turn can have
+ * one or mulitple so-called "Shared Clipboard transfer" objects. At the moment we only support
+ * on concurrent Shared Clipboard transfer per transfer context. It's being used for reading from a
+ * source or writing to destination, depening on its direction. An Shared Clipboard transfer
  * can have optional callbacks which might be needed by various implementations.
  * Also, transfers optionally can run in an asynchronous thread to prevent
  * blocking the UI while running.
  *
- * An URI transfer can maintain its own clipboard area; for the host service such
+ * An Shared Clipboard transfer can maintain its own clipboard area; for the host service such
  * a clipboard area is coupled to a clipboard area registered or attached with
  * VBoxSVC. This is needed because multiple transfers from multiple VMs (n:n) can
@@ -145 +145 @@
  * no references are held to it  anymore, or if VBoxSVC goes down.
  *
- * @section sec_uri_providers           URI providers
+ * @section sec_transfer_providers        Transfer providers
  *
  * For certain implementations (for example on Windows guests / hosts, using
  * IDataObject and IStream objects) a more flexible approach reqarding reading /
- * writing is needed. For this so-called URI providers abstract the way of how
+ * writing is needed. For this so-called transfer providers abstract the way of how
  * data is being read / written in the current context (host / guest), while
  * the rest of the code stays the same.
  *
- * @section sec_uri_protocol            URI protocol
+ * @section sec_transfer_protocol         Transfer protocol
  *
  * The host service issues commands which the guest has to respond with an own
@@ -170 +170 @@
  * might need this mechanism.
  *
- * An URI transfer has three stages:
- *  - 1. Announcement: An URI transfer-compatible format (currently only one format available)
+ * An Shared Clipboard transfer has three stages:
+ *  - 1. Announcement: An Shared Clipboard transfer-compatible format (currently only one format available)
  *          has been announced, the destination side creates a transfer object, which then,
  *          depending on the actual implementation, can be used to tell the OS that
- *          there is URI (file) data available.
+ *          there is transfer (file) data available.
  *          At this point this just acts as a (kind-of) promise to the OS that we
  *          can provide (file) data at some later point in time.
@@ -1100 +1100 @@
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-    PSHCLURITRANSFER pTransfer = SharedClipboardURICtxGetTransfer(&pClient->URI, 0 /* Index*/);
+    PSHCLTRANSFER pTransfer = SharedClipboardTransferCtxGetTransfer(&pClient->TransferCtx, 0 /* Index*/);
     if (pTransfer)
-        sharedClipboardSvcURIAreaDetach(&pClient->State, pTransfer);
-
-    SharedClipboardURICtxDestroy(&pClient->URI);
+        sharedClipboardSvcTransferAreaDetach(&pClient->State, pTransfer);
+
+    SharedClipboardTransferCtxDestroy(&pClient->TransferCtx);
 #endif
 
@@ -1151 +1151 @@
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
             if (RT_SUCCESS(rc))
-                rc = SharedClipboardURICtxInit(&pClient->URI);
+                rc = SharedClipboardTransferCtxInit(&pClient->TransferCtx);
 #endif
             if (RT_SUCCESS(rc))
@@ -1378 +1378 @@
                     if (uFormat == VBOX_SHCL_FMT_URI_LIST)
                     {
-                        rc = sharedClipboardSvcURITransferStart(pClient, SHCLURITRANSFERDIR_WRITE, SHCLSOURCE_LOCAL,
-                                                                NULL /* pTransfer */);
+                        rc = sharedClipboardSvcTransferTransferStart(pClient, SHCLTRANSFERDIR_WRITE, SHCLSOURCE_LOCAL,
+                                                                     NULL /* pTransfer */);
                         if (RT_FAILURE(rc))
                             LogRel(("Shared Clipboard: Initializing host write transfer failed with %Rrc\n", rc));
@@ -1476 +1476 @@
         {
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-            rc = sharedClipboardSvcURIHandler(pClient, callHandle, u32Function, cParms, paParms, tsArrival);
+            rc = sharedClipboardSvcTransferHandler(pClient, callHandle, u32Function, cParms, paParms, tsArrival);
 #else
             rc = VERR_NOT_IMPLEMENTED;
@@ -1538 +1538 @@
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-    pClientState->URI.enmTransferDir = SHCLURITRANSFERDIR_UNKNOWN;
+    pClientState->Transfers.enmTransferDir = SHCLTRANSFERDIR_UNKNOWN;
 #else
     RT_NOREF(pClientState);
@@ -1599 +1599 @@
         {
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-            rc = sharedClipboardSvcURIHostHandler(u32Function, cParms, paParms);
+            rc = sharedClipboardSvcTransferHostHandler(u32Function, cParms, paParms);
 #else
             rc = VERR_NOT_IMPLEMENTED;
@@ -1628 +1628 @@
 static SSMFIELD const s_aShClSSMClientURIState[] =
 {
-    SSMFIELD_ENTRY(SHCLCLIENTURISTATE, enmTransferDir),
+    SSMFIELD_ENTRY(SHCLCLIENTTRANSFERSTATE, enmTransferDir),
     SSMFIELD_ENTRY_TERM()
 };
@@ -1675 +1675 @@
     AssertRCReturn(rc, rc);
 
-    rc = SSMR3PutStructEx(pSSM, &pClient->State.URI, sizeof(pClient->State.URI), 0 /*fFlags*/, &s_aShClSSMClientURIState[0], NULL);
+    rc = SSMR3PutStructEx(pSSM, &pClient->State.Transfers, sizeof(pClient->State.Transfers), 0 /*fFlags*/, &s_aShClSSMClientURIState[0], NULL);
     AssertRCReturn(rc, rc);
 
@@ -1764 +1764 @@
         AssertRCReturn(rc, rc);
 
-        rc = SSMR3GetStructEx(pSSM, &pClient->State.URI, sizeof(pClient->State.URI), 0 /*fFlags*/, &s_aShClSSMClientURIState[0], NULL);
+        rc = SSMR3GetStructEx(pSSM, &pClient->State.Transfers, sizeof(pClient->State.Transfers), 0 /*fFlags*/, &s_aShClSSMClientURIState[0], NULL);
         AssertRCReturn(rc, rc);