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

Timestamp:

Oct 11, 2019 12:06:49 PM (5 years ago)

Author:

vboxsync

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

133910

Message:

Shared Clipboard/Transfers: Renaming.

Location:

trunk/src/VBox/HostServices/SharedClipboard

Files:

• VBoxSharedClipboardSvc-transfers.cpp (modified) (79 diffs)
• VBoxSharedClipboardSvc-win.cpp (modified) (4 diffs)
• VBoxSharedClipboardSvc-x11.cpp (modified) (6 diffs)
• VBoxSharedClipboardSvc.cpp (modified) (18 diffs)
• darwin-pasteboard.cpp (modified) (6 diffs)

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

@@ -87 +87 @@
     if (pMsgHdr)
     {
-        SHCLEVENTID uEvent = SharedClipboardEventIDGenerate(&pCtx->pTransfer->Events);
+        SHCLEVENTID uEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
 
         HGCMSvcSetU32(&pMsgHdr->paParms[0], VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID,
@@ -96 +96 @@
         if (RT_SUCCESS(rc))
         {
-            int rc2 = SharedClipboardEventRegister(&pCtx->pTransfer->Events, uEvent);
+            int rc2 = ShClEventRegister(&pCtx->pTransfer->Events, uEvent);
             AssertRC(rc2);
 
@@ -103 +103 @@
             {
                 PSHCLEVENTPAYLOAD pPayloadHdr;
-                rc = SharedClipboardEventWait(&pCtx->pTransfer->Events, uEvent,
+                rc = ShClEventWait(&pCtx->pTransfer->Events, uEvent,
                                               pCtx->pTransfer->uTimeoutMs, &pPayloadHdr);
                 if (RT_SUCCESS(rc))
@@ -112 +112 @@
                     LogFlowFunc(("cRoots=%RU32, fRoots=0x%x\n", pSrcRootListHdr->cRoots, pSrcRootListHdr->fRoots));
 
-                    PSHCLROOTLIST pRootList = SharedClipboardTransferRootListAlloc();
+                    PSHCLROOTLIST pRootList = ShClTransferRootListAlloc();
                     if (pRootList)
                     {
@@ -127 +127 @@
                                                                                VBOX_SHCL_CPARMS_ROOT_LIST_ENTRY_READ_REQ);
 
-                                    uEvent = SharedClipboardEventIDGenerate(&pCtx->pTransfer->Events);
+                                    uEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
 
                                     HGCMSvcSetU32(&pMsgEntry->paParms[0],
@@ -135 +135 @@
                                     HGCMSvcSetU32(&pMsgEntry->paParms[2], i /* uIndex */);
 
-                                    rc2 = SharedClipboardEventRegister(&pCtx->pTransfer->Events, uEvent);
+                                    rc2 = ShClEventRegister(&pCtx->pTransfer->Events, uEvent);
                                     AssertRC(rc2);
 
@@ -143 +143 @@
 
                                     PSHCLEVENTPAYLOAD pPayloadEntry;
-                                    rc = SharedClipboardEventWait(&pCtx->pTransfer->Events, uEvent,
-                                                                  pCtx->pTransfer->uTimeoutMs, &pPayloadEntry);
+                                    rc = ShClEventWait(&pCtx->pTransfer->Events, uEvent,
+                                                       pCtx->pTransfer->uTimeoutMs, &pPayloadEntry);
                                     if (RT_FAILURE(rc))
                                         break;
@@ -151 +151 @@
                                     Assert(pPayloadEntry->cbData == sizeof(SHCLROOTLISTENTRY));
 
-                                    rc = SharedClipboardTransferListEntryCopy(&pRootList->paEntries[i], pSrcRootListEntry);
-
-                                    SharedClipboardPayloadFree(pPayloadEntry);
-
-                                    SharedClipboardEventUnregister(&pCtx->pTransfer->Events, uEvent);
+                                    rc = ShClTransferListEntryCopy(&pRootList->paEntries[i], pSrcRootListEntry);
+
+                                    ShClPayloadFree(pPayloadEntry);
+
+                                    ShClEventUnregister(&pCtx->pTransfer->Events, uEvent);
 
                                     if (RT_FAILURE(rc))
@@ -173 +173 @@
                         }
                         else
-                            SharedClipboardTransferRootListFree(pRootList);
-
-                        SharedClipboardPayloadFree(pPayloadHdr);
+                            ShClTransferRootListFree(pRootList);
+
+                        ShClPayloadFree(pPayloadHdr);
                     }
                     else
@@ -182 +182 @@
             }
 
-            SharedClipboardEventUnregister(&pCtx->pTransfer->Events, uEvent);
+            ShClEventUnregister(&pCtx->pTransfer->Events, uEvent);
         }
     }
@@ -206 +206 @@
     if (pMsg)
     {
-        const SHCLEVENTID uEvent = SharedClipboardEventIDGenerate(&pCtx->pTransfer->Events);
+        const SHCLEVENTID uEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
 
         pMsg->Ctx.uContextID = VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID,  pCtx->pTransfer->State.uID,
@@ -217 +217 @@
             if (RT_SUCCESS(rc))
             {
-                int rc2 = SharedClipboardEventRegister(&pCtx->pTransfer->Events, uEvent);
+                int rc2 = ShClEventRegister(&pCtx->pTransfer->Events, uEvent);
                 AssertRC(rc2);
 
@@ -224 +224 @@
                 {
                     PSHCLEVENTPAYLOAD pPayload;
-                    rc = SharedClipboardEventWait(&pCtx->pTransfer->Events, uEvent, pCtx->pTransfer->uTimeoutMs, &pPayload);
+                    rc = ShClEventWait(&pCtx->pTransfer->Events, uEvent, pCtx->pTransfer->uTimeoutMs, &pPayload);
                     if (RT_SUCCESS(rc))
                     {
@@ -236 +236 @@
                         *phList = pReply->u.ListOpen.uHandle;
 
-                        SharedClipboardPayloadFree(pPayload);
+                        ShClPayloadFree(pPayload);
                     }
                 }
 
-                SharedClipboardEventUnregister(&pCtx->pTransfer->Events, uEvent);
+                ShClEventUnregister(&pCtx->pTransfer->Events, uEvent);
             }
         }
@@ -264 +264 @@
     if (pMsg)
     {
-        const SHCLEVENTID uEvent = SharedClipboardEventIDGenerate(&pCtx->pTransfer->Events);
+        const SHCLEVENTID uEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
 
         pMsg->Ctx.uContextID = VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID, pCtx->pTransfer->State.uID,
@@ -275 +275 @@
             if (RT_SUCCESS(rc))
             {
-                int rc2 = SharedClipboardEventRegister(&pCtx->pTransfer->Events, uEvent);
+                int rc2 = ShClEventRegister(&pCtx->pTransfer->Events, uEvent);
                 AssertRC(rc2);
 
@@ -282 +282 @@
                 {
                     PSHCLEVENTPAYLOAD pPayload;
-                    rc = SharedClipboardEventWait(&pCtx->pTransfer->Events, uEvent, pCtx->pTransfer->uTimeoutMs, &pPayload);
+                    rc = ShClEventWait(&pCtx->pTransfer->Events, uEvent, pCtx->pTransfer->uTimeoutMs, &pPayload);
                     if (RT_SUCCESS(rc))
-                        SharedClipboardPayloadFree(pPayload);
-                }
-
-                SharedClipboardEventUnregister(&pCtx->pTransfer->Events, uEvent);
+                        ShClPayloadFree(pPayload);
+                }
+
+                ShClEventUnregister(&pCtx->pTransfer->Events, uEvent);
             }
         }
@@ -312 +312 @@
     if (pMsg)
     {
-        const SHCLEVENTID uEvent = SharedClipboardEventIDGenerate(&pCtx->pTransfer->Events);
+        const SHCLEVENTID uEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
 
         HGCMSvcSetU32(&pMsg->paParms[0], VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID,
@@ -322 +322 @@
         if (RT_SUCCESS(rc))
         {
-            int rc2 = SharedClipboardEventRegister(&pCtx->pTransfer->Events, uEvent);
+            int rc2 = ShClEventRegister(&pCtx->pTransfer->Events, uEvent);
             AssertRC(rc2);
 
@@ -329 +329 @@
             {
                 PSHCLEVENTPAYLOAD pPayload;
-                rc = SharedClipboardEventWait(&pCtx->pTransfer->Events, uEvent,
-                                             pCtx->pTransfer->uTimeoutMs, &pPayload);
+                rc = ShClEventWait(&pCtx->pTransfer->Events, uEvent,
+                                   pCtx->pTransfer->uTimeoutMs, &pPayload);
                 if (RT_SUCCESS(rc))
                 {
@@ -337 +337 @@
                     *pListHdr = *(PSHCLLISTHDR)pPayload->pvData;
 
-                    SharedClipboardPayloadFree(pPayload);
+                    ShClPayloadFree(pPayload);
                 }
             }
@@ -373 +373 @@
     if (pMsg)
     {
-        const SHCLEVENTID uEvent = SharedClipboardEventIDGenerate(&pCtx->pTransfer->Events);
+        const SHCLEVENTID uEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
 
         HGCMSvcSetU32(&pMsg->paParms[0], VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID,
@@ -383 +383 @@
         if (RT_SUCCESS(rc))
         {
-            int rc2 = SharedClipboardEventRegister(&pCtx->pTransfer->Events, uEvent);
+            int rc2 = ShClEventRegister(&pCtx->pTransfer->Events, uEvent);
             AssertRC(rc2);
 
@@ -390 +390 @@
             {
                 PSHCLEVENTPAYLOAD pPayload;
-                rc = SharedClipboardEventWait(&pCtx->pTransfer->Events, uEvent, pCtx->pTransfer->uTimeoutMs, &pPayload);
+                rc = ShClEventWait(&pCtx->pTransfer->Events, uEvent, pCtx->pTransfer->uTimeoutMs, &pPayload);
                 if (RT_SUCCESS(rc))
                 {
                     Assert(pPayload->cbData == sizeof(SHCLLISTENTRY));
 
-                    rc = SharedClipboardTransferListEntryCopy(pListEntry, (PSHCLLISTENTRY)pPayload->pvData);
-
-                    SharedClipboardPayloadFree(pPayload);
+                    rc = ShClTransferListEntryCopy(pListEntry, (PSHCLLISTENTRY)pPayload->pvData);
+
+                    ShClPayloadFree(pPayload);
                 }
             }
@@ -433 +433 @@
     if (pMsg)
     {
-        const SHCLEVENTID uEvent = SharedClipboardEventIDGenerate(&pCtx->pTransfer->Events);
+        const SHCLEVENTID uEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
 
         LogFlowFunc(("pszPath=%s, fCreate=0x%x\n", pCreateParms->pszPath, pCreateParms->fCreate));
@@ -449 +449 @@
         if (RT_SUCCESS(rc))
         {
-            int rc2 = SharedClipboardEventRegister(&pCtx->pTransfer->Events, uEvent);
+            int rc2 = ShClEventRegister(&pCtx->pTransfer->Events, uEvent);
             AssertRC(rc2);
 
@@ -456 +456 @@
             {
                 PSHCLEVENTPAYLOAD pPayload;
-                rc = SharedClipboardEventWait(&pCtx->pTransfer->Events, uEvent, pCtx->pTransfer->uTimeoutMs, &pPayload);
+                rc = ShClEventWait(&pCtx->pTransfer->Events, uEvent, pCtx->pTransfer->uTimeoutMs, &pPayload);
                 if (RT_SUCCESS(rc))
                 {
@@ -468 +468 @@
                     *phObj = pReply->u.ObjOpen.uHandle;
 
-                    SharedClipboardPayloadFree(pPayload);
+                    ShClPayloadFree(pPayload);
                 }
             }
@@ -493 +493 @@
     if (pMsg)
     {
-        const SHCLEVENTID uEvent = SharedClipboardEventIDGenerate(&pCtx->pTransfer->Events);
+        const SHCLEVENTID uEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
 
         HGCMSvcSetU32(&pMsg->paParms[0], VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID,
@@ -502 +502 @@
         if (RT_SUCCESS(rc))
         {
-            int rc2 = SharedClipboardEventRegister(&pCtx->pTransfer->Events, uEvent);
+            int rc2 = ShClEventRegister(&pCtx->pTransfer->Events, uEvent);
             AssertRC(rc2);
 
@@ -509 +509 @@
             {
                 PSHCLEVENTPAYLOAD pPayload;
-                rc = SharedClipboardEventWait(&pCtx->pTransfer->Events, uEvent, pCtx->pTransfer->uTimeoutMs, &pPayload);
+                rc = ShClEventWait(&pCtx->pTransfer->Events, uEvent, pCtx->pTransfer->uTimeoutMs, &pPayload);
                 if (RT_SUCCESS(rc))
                 {
@@ -521 +521 @@
 #endif
 
-                    SharedClipboardPayloadFree(pPayload);
+                    ShClPayloadFree(pPayload);
                 }
             }
@@ -547 +547 @@
     if (pMsg)
     {
-        const SHCLEVENTID uEvent = SharedClipboardEventIDGenerate(&pCtx->pTransfer->Events);
+        const SHCLEVENTID uEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
 
         HGCMSvcSetU32(&pMsg->paParms[0], VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID,
@@ -558 +558 @@
         if (RT_SUCCESS(rc))
         {
-            int rc2 = SharedClipboardEventRegister(&pCtx->pTransfer->Events, uEvent);
+            int rc2 = ShClEventRegister(&pCtx->pTransfer->Events, uEvent);
             AssertRC(rc2);
 
@@ -565 +565 @@
             {
                 PSHCLEVENTPAYLOAD pPayload;
-                rc = SharedClipboardEventWait(&pCtx->pTransfer->Events, uEvent, pCtx->pTransfer->uTimeoutMs, &pPayload);
+                rc = ShClEventWait(&pCtx->pTransfer->Events, uEvent, pCtx->pTransfer->uTimeoutMs, &pPayload);
                 if (RT_SUCCESS(rc))
                 {
@@ -580 +580 @@
                         *pcbRead = cbRead;
 
-                    SharedClipboardPayloadFree(pPayload);
+                    ShClPayloadFree(pPayload);
                 }
             }
@@ -606 +606 @@
     if (pMsg)
     {
-        const SHCLEVENTID uEvent = SharedClipboardEventIDGenerate(&pCtx->pTransfer->Events);
+        const SHCLEVENTID uEvent = ShClEventIDGenerate(&pCtx->pTransfer->Events);
 
         HGCMSvcSetU32(&pMsg->paParms[0], VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID,
@@ -617 +617 @@
         if (RT_SUCCESS(rc))
         {
-            int rc2 = SharedClipboardEventRegister(&pCtx->pTransfer->Events, uEvent);
+            int rc2 = ShClEventRegister(&pCtx->pTransfer->Events, uEvent);
             AssertRC(rc2);
 
@@ -624 +624 @@
             {
                 PSHCLEVENTPAYLOAD pPayload;
-                rc = SharedClipboardEventWait(&pCtx->pTransfer->Events, uEvent, pCtx->pTransfer->uTimeoutMs, &pPayload);
+                rc = ShClEventWait(&pCtx->pTransfer->Events, uEvent, pCtx->pTransfer->uTimeoutMs, &pPayload);
                 if (RT_SUCCESS(rc))
                 {
@@ -634 +634 @@
                         *pcbWritten = cbRead;
 
-                    SharedClipboardPayloadFree(pPayload);
+                    ShClPayloadFree(pPayload);
                 }
             }
@@ -722 +722 @@
     }
 
-    LogFlowFunc(("uMsg=%RU32 (%s), uMode=%RU32 -> fAllowed=%RTbool\n", uMsg, VBoxShClGuestMsgToStr(uMsg), uMode, fAllowed));
+    LogFlowFunc(("uMsg=%RU32 (%s), uMode=%RU32 -> fAllowed=%RTbool\n", uMsg, ShClGuestMsgToStr(uMsg), uMode, fAllowed));
     return fAllowed;
 }
@@ -1077 +1077 @@
         if (RT_SUCCESS(rc))
         {
-            if (!SharedClipboardTransferListEntryIsValid(pListEntry))
+            if (!ShClTransferListEntryIsValid(pListEntry))
                 rc = VERR_INVALID_PARAMETER;
         }
@@ -1236 +1236 @@
                             LogFlowFunc(("uCID=%RU32 -> uEvent=%RU32\n", uCID, uEvent));
 
-                            rc = SharedClipboardEventSignal(&pTransfer->Events, uEvent, pPayload);
+                            rc = ShClEventSignal(&pTransfer->Events, uEvent, pPayload);
                         }
                         break;
@@ -1290 +1290 @@
 
     LogFlowFunc(("uClient=%RU32, u32Function=%RU32 (%s), cParms=%RU32, g_ExtState.pfnExtension=%p\n",
-                 pClient->State.uClientID, u32Function, VBoxShClGuestMsgToStr(u32Function), cParms, g_ExtState.pfnExtension));
+                 pClient->State.uClientID, u32Function, ShClGuestMsgToStr(u32Function), cParms, g_ExtState.pfnExtension));
 
     /* Check if we've the right mode set. */
@@ -1322 +1322 @@
         default:
         {
-            if (!SharedClipboardTransferCtxGetTotalTransfers(&pClient->TransferCtx))
+            if (!ShClTransferCtxGetTotalTransfers(&pClient->TransferCtx))
             {
                 LogFunc(("No transfers found\n"));
@@ -1338 +1338 @@
             const SHCLTRANSFERID uTransferID = VBOX_SHCL_CONTEXTID_GET_TRANSFER(uCID);
 
-            pTransfer = SharedClipboardTransferCtxGetTransfer(&pClient->TransferCtx, uTransferID);
+            pTransfer = ShClTransferCtxGetTransfer(&pClient->TransferCtx, uTransferID);
             if (!pTransfer)
             {
@@ -1369 +1369 @@
             RT_ZERO(rootListHdr);
 
-            rootListHdr.cRoots = SharedClipboardTransferRootsCount(pTransfer);
+            rootListHdr.cRoots = ShClTransferRootsCount(pTransfer);
 
             HGCMSvcSetU32(&paParms[0], 0 /* Context ID */);
@@ -1385 +1385 @@
             if (RT_SUCCESS(rc))
             {
-                void    *pvData = SharedClipboardTransferRootListHdrDup(&lstHdr);
+                void    *pvData = ShClTransferRootListHdrDup(&lstHdr);
                 uint32_t cbData = sizeof(SHCLROOTLISTHDR);
 
@@ -1391 +1391 @@
 
                 PSHCLEVENTPAYLOAD pPayload;
-                rc = SharedClipboardPayloadAlloc(uEvent, pvData, cbData, &pPayload);
+                rc = ShClPayloadAlloc(uEvent, pvData, cbData, &pPayload);
                 if (RT_SUCCESS(rc))
                 {
-                    rc = SharedClipboardEventSignal(&pTransfer->Events, uEvent, pPayload);
+                    rc = ShClEventSignal(&pTransfer->Events, uEvent, pPayload);
                     if (RT_FAILURE(rc))
-                        SharedClipboardPayloadFree(pPayload);
+                        ShClPayloadFree(pPayload);
                 }
             }
@@ -1413 +1413 @@
             {
                 SHCLROOTLISTENTRY rootListEntry;
-                rc = SharedClipboardTransferRootsEntry(pTransfer, uIndex, &rootListEntry);
+                rc = ShClTransferRootsEntry(pTransfer, uIndex, &rootListEntry);
                 if (RT_SUCCESS(rc))
                 {
@@ -1430 +1430 @@
             if (RT_SUCCESS(rc))
             {
-                void    *pvData = SharedClipboardTransferRootListEntryDup(&lstEntry);
+                void    *pvData = ShClTransferRootListEntryDup(&lstEntry);
                 uint32_t cbData = sizeof(SHCLROOTLISTENTRY);
 
@@ -1436 +1436 @@
 
                 PSHCLEVENTPAYLOAD pPayload;
-                rc = SharedClipboardPayloadAlloc(uEvent, pvData, cbData, &pPayload);
+                rc = ShClPayloadAlloc(uEvent, pvData, cbData, &pPayload);
                 if (RT_SUCCESS(rc))
                 {
-                    rc = SharedClipboardEventSignal(&pTransfer->Events, uEvent, pPayload);
+                    rc = ShClEventSignal(&pTransfer->Events, uEvent, pPayload);
                     if (RT_FAILURE(rc))
-                        SharedClipboardPayloadFree(pPayload);
+                        ShClPayloadFree(pPayload);
                 }
             }
@@ -1454 +1454 @@
             {
                 SHCLLISTHANDLE hList;
-                rc = SharedClipboardTransferListOpen(pTransfer, &listOpenParms, &hList);
+                rc = ShClTransferListOpen(pTransfer, &listOpenParms, &hList);
                 if (RT_SUCCESS(rc))
                 {
@@ -1473 +1473 @@
             if (RT_SUCCESS(rc))
             {
-                rc = SharedClipboardTransferListClose(pTransfer, hList);
+                rc = ShClTransferListClose(pTransfer, hList);
             }
             break;
@@ -1488 +1488 @@
             {
                 SHCLLISTHDR hdrList;
-                rc = SharedClipboardTransferListGetHeader(pTransfer, hList, &hdrList);
+                rc = ShClTransferListGetHeader(pTransfer, hList, &hdrList);
                 /*if (RT_SUCCESS(rc))
                     rc = shclSvcTransferSetListHdr(cParms, paParms, &hdrList);*/
@@ -1498 +1498 @@
         {
             SHCLLISTHDR hdrList;
-            rc = SharedClipboardTransferListHdrInit(&hdrList);
+            rc = ShClTransferListHdrInit(&hdrList);
             if (RT_SUCCESS(rc))
             {
@@ -1511 +1511 @@
 
                     PSHCLEVENTPAYLOAD pPayload;
-                    rc = SharedClipboardPayloadAlloc(uEvent, pvData, cbData, &pPayload);
+                    rc = ShClPayloadAlloc(uEvent, pvData, cbData, &pPayload);
                     if (RT_SUCCESS(rc))
                     {
-                        rc = SharedClipboardEventSignal(&pTransfer->Events, uEvent, pPayload);
+                        rc = ShClEventSignal(&pTransfer->Events, uEvent, pPayload);
                         if (RT_FAILURE(rc))
-                            SharedClipboardPayloadFree(pPayload);
+                            ShClPayloadFree(pPayload);
                     }
                 }
@@ -1533 +1533 @@
             {
                 SHCLLISTENTRY entryList;
-                rc = SharedClipboardTransferListRead(pTransfer, hList, &entryList);
+                rc = ShClTransferListRead(pTransfer, hList, &entryList);
             }
             break;
@@ -1541 +1541 @@
         {
             SHCLLISTENTRY entryList;
-            rc = SharedClipboardTransferListEntryInit(&entryList);
+            rc = ShClTransferListEntryInit(&entryList);
             if (RT_SUCCESS(rc))
             {
@@ -1548 +1548 @@
                 if (RT_SUCCESS(rc))
                 {
-                    void    *pvData = SharedClipboardTransferListEntryDup(&entryList);
+                    void    *pvData = ShClTransferListEntryDup(&entryList);
                     uint32_t cbData = sizeof(SHCLLISTENTRY);
 
@@ -1554 +1554 @@
 
                     PSHCLEVENTPAYLOAD pPayload;
-                    rc = SharedClipboardPayloadAlloc(uEvent, pvData, cbData, &pPayload);
+                    rc = ShClPayloadAlloc(uEvent, pvData, cbData, &pPayload);
                     if (RT_SUCCESS(rc))
                     {
-                        rc = SharedClipboardEventSignal(&pTransfer->Events, uEvent, pPayload);
+                        rc = ShClEventSignal(&pTransfer->Events, uEvent, pPayload);
                         if (RT_FAILURE(rc))
-                            SharedClipboardPayloadFree(pPayload);
+                            ShClPayloadFree(pPayload);
                     }
                 }
@@ -1588 +1588 @@
             {
                 SHCLOBJHANDLE hObj;
-                rc = SharedClipboardTransferObjectOpen(pTransfer, &openCreateParms, &hObj);
+                rc = ShClTransferObjOpen(pTransfer, &openCreateParms, &hObj);
                 if (RT_SUCCESS(rc))
                 {
@@ -1607 +1607 @@
             rc = HGCMSvcGetU64(&paParms[1], &hObj); /* Get object handle. */
             if (RT_SUCCESS(rc))
-                rc = SharedClipboardTransferObjectClose(pTransfer, hObj);
+                rc = ShClTransferObjClose(pTransfer, hObj);
             break;
         }
@@ -1643 +1643 @@
             {
                 uint32_t cbRead;
-                rc = SharedClipboardTransferObjectRead(pTransfer, hObj, pvBuf, cbToRead, &cbRead, 0 /* fFlags */);
+                rc = ShClTransferObjRead(pTransfer, hObj, pvBuf, cbToRead, &cbRead, 0 /* fFlags */);
                 if (RT_SUCCESS(rc))
                 {
@@ -1660 +1660 @@
             if (RT_SUCCESS(rc))
             {
-                void    *pvData = SharedClipboardTransferObjectDataChunkDup(&dataChunk);
+                void    *pvData = ShClTransferObjDataChunkDup(&dataChunk);
                 uint32_t cbData = sizeof(SHCLOBJDATACHUNK);
 
@@ -1666 +1666 @@
 
                 PSHCLEVENTPAYLOAD pPayload;
-                rc = SharedClipboardPayloadAlloc(uEvent, pvData, cbData, &pPayload);
+                rc = ShClPayloadAlloc(uEvent, pvData, cbData, &pPayload);
                 if (RT_SUCCESS(rc))
                 {
-                    rc = SharedClipboardEventSignal(&pTransfer->Events, uEvent, pPayload);
+                    rc = ShClEventSignal(&pTransfer->Events, uEvent, pPayload);
                     if (RT_FAILURE(rc))
-                        SharedClipboardPayloadFree(pPayload);
+                        ShClPayloadFree(pPayload);
                 }
             }
@@ -2111 +2111 @@
         return VERR_NO_MEMORY;
 
-    const SHCLEVENTID uEvent = SharedClipboardEventIDGenerate(&pTransfer->Events);
+    const SHCLEVENTID uEvent = ShClEventIDGenerate(&pTransfer->Events);
 
     HGCMSvcSetU32(&pMsgReadData->paParms[0], VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID,
-                                                                                  pTransfer->State.uID, uEvent));
+                                                                      pTransfer->State.uID, uEvent));
     HGCMSvcSetU32(&pMsgReadData->paParms[1], pTransfer->State.enmDir);
     HGCMSvcSetU32(&pMsgReadData->paParms[2], uStatus);
@@ -2123 +2123 @@
     if (RT_SUCCESS(rc))
     {
-        rc = SharedClipboardEventRegister(&pTransfer->Events, uEvent);
+        rc = ShClEventRegister(&pTransfer->Events, uEvent);
         if (RT_SUCCESS(rc))
         {
@@ -2130 +2130 @@
             {
                 LogRel2(("Shared Clipboard: Reported status %s (rc=%Rrc) of transfer %RU32 to guest\n",
-                         VBoxShClTransferStatusToStr(uStatus), rcTransfer, pTransfer->State.uID));
+                         ShClGuestMsgToStr(uStatus), rcTransfer, pTransfer->State.uID));
 
                 if (puEvent)
@@ -2136 +2136 @@
             }
             else
-                SharedClipboardEventUnregister(&pTransfer->Events, uEvent);
+                ShClEventUnregister(&pTransfer->Events, uEvent);
         }
     }
@@ -2162 +2162 @@
     LogFlowFuncEnter();
 
-    SharedClipboardTransferCtxCleanup(&pClient->TransferCtx);
+    ShClTransferCtxCleanup(&pClient->TransferCtx);
 
     int rc;
 
-    if (!SharedClipboardTransferCtxTransfersMaximumReached(&pClient->TransferCtx))
+    if (!ShClTransferCtxTransfersMaximumReached(&pClient->TransferCtx))
     {
         LogRel2(("Shared Clipboard: Starting %s transfer ...\n", enmDir == SHCLTRANSFERDIR_READ ? "read" : "write"));
 
         PSHCLTRANSFER pTransfer;
-        rc = SharedClipboardTransferCreate(&pTransfer);
+        rc = ShClTransferCreate(&pTransfer);
         if (RT_SUCCESS(rc))
         {
@@ -2214 +2214 @@
                 uint32_t uTransferID = 0;
 
-                rc = SharedClipboardTransferSetInterface(pTransfer, &creationCtx);
+                rc = ShClTransferSetInterface(pTransfer, &creationCtx);
                 if (RT_SUCCESS(rc))
                 {
-                    rc = SharedClipboardTransferCtxTransferRegister(&pClient->TransferCtx, pTransfer, &uTransferID);
+                    rc = ShClTransferCtxTransferRegister(&pClient->TransferCtx, pTransfer, &uTransferID);
                     if (RT_SUCCESS(rc))
                     {
-                        rc = SharedClipboardTransferInit(pTransfer, uTransferID, enmDir, enmSource);
+                        rc = ShClTransferInit(pTransfer, uTransferID, enmDir, enmSource);
                         if (RT_SUCCESS(rc))
                         {
@@ -2230 +2230 @@
 
                             if (RT_SUCCESS(rc))
-                                rc = SharedClipboardTransferStart(pTransfer);
+                                rc = ShClTransferStart(pTransfer);
 
                             if (RT_SUCCESS(rc))
@@ -2244 +2244 @@
 
                                     PSHCLEVENTPAYLOAD pPayload;
-                                    rc = SharedClipboardEventWait(&pTransfer->Events, uEvent, pTransfer->uTimeoutMs, &pPayload);
+                                    rc = ShClEventWait(&pTransfer->Events, uEvent, pTransfer->uTimeoutMs, &pPayload);
                                     if (RT_SUCCESS(rc))
                                     {
@@ -2259 +2259 @@
                                         else
                                             LogRel(("Shared Clipboard: Guest reported status %s (error %Rrc) while starting transfer %RU32\n",
-                                                    VBoxShClTransferStatusToStr(pReply->u.TransferStatus.uStatus),
+                                                    ShClGuestMsgToStr(pReply->u.TransferStatus.uStatus),
                                                     pReply->rc, pTransfer->State.uID));
                                     }
@@ -2270 +2270 @@
 
                         if (RT_FAILURE(rc))
-                            SharedClipboardTransferCtxTransferUnregister(&pClient->TransferCtx, uTransferID);
+                            ShClTransferCtxTransferUnregister(&pClient->TransferCtx, uTransferID);
                     }
                 }
@@ -2278 +2278 @@
             {
                 ShClSvcImplTransferDestroy(pClient, pTransfer);
-                SharedClipboardTransferDestroy(pTransfer);
+                ShClTransferDestroy(pTransfer);
 
                 RTMemFree(pTransfer);
@@ -2309 +2309 @@
 int shclSvcTransferStop(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer)
 {
-    int rc = SharedClipboardTransferClose(pTransfer);
+    int rc = ShClTransferClose(pTransfer);
     if (RT_SUCCESS(rc))
     {
@@ -2320 +2320 @@
             LogRel2(("Shared Clipboard: Waiting for stop of transfer %RU32 on guest ...\n", pTransfer->State.uID));
 
-            rc = SharedClipboardEventWait(&pTransfer->Events, uEvent, pTransfer->uTimeoutMs, NULL);
-            if (RT_SUCCESS(rc))
-            {
-                rc = SharedClipboardTransferCtxTransferUnregister(&pClient->TransferCtx, SharedClipboardTransferGetID(pTransfer));
+            rc = ShClEventWait(&pTransfer->Events, uEvent, pTransfer->uTimeoutMs, NULL);
+            if (RT_SUCCESS(rc))
+            {
+                rc = ShClTransferCtxTransferUnregister(&pClient->TransferCtx, ShClTransferGetID(pTransfer));
 
                 LogRel2(("Shared Clipboard: Stopped transfer %RU32 on guest\n", pTransfer->State.uID));

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

@@ -108 +108 @@
 
 #ifdef LOG_ENABLED
-    VBoxShClDbgDumpData(pvDst, cbSrc, u32Format);
+    ShClDbgDumpData(pvDst, cbSrc, u32Format);
 #endif
 
@@ -183 +183 @@
     {
         PSHCLEVENTPAYLOAD pPayload;
-        rc = SharedClipboardEventWait(&pCtx->pClient->Events, uEvent, 30 * 1000, &pPayload);
+        rc = ShClEventWait(&pCtx->pClient->Events, uEvent, 30 * 1000, &pPayload);
         if (RT_SUCCESS(rc))
         {
@@ -190 +190 @@
 
             /* Detach the payload, as the caller then will own the data. */
-            SharedClipboardEventPayloadDetach(&pCtx->pClient->Events, uEvent);
-        }
-
-        SharedClipboardEventUnregister(&pCtx->pClient->Events, uEvent);
+            ShClEventPayloadDetach(&pCtx->pClient->Events, uEvent);
+        }
+
+        ShClEventUnregister(&pCtx->pClient->Events, uEvent);
     }
 
@@ -829 +829 @@
 #ifdef VBOX_STRICT
                         LogFlowFunc(("Raw HTML clipboard data from host:"));
-                        VBoxShClDbgDumpHtml((char *)pData->pvData, pData->cbData);
+                        ShClDbgDumpHtml((char *)pData->pvData, pData->cbData);
 #endif
                         GlobalUnlock(hClip);

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

@@ -224 +224 @@
     if (pReq)
     {
-        const SHCLEVENTID uEvent = SharedClipboardEventIDGenerate(&pClient->Events);
+        const SHCLEVENTID uEvent = ShClEventIDGenerate(&pClient->Events);
 
         pReq->pv        = pData->pvData;
@@ -234 +234 @@
         if (RT_SUCCESS(rc))
         {
-            rc = SharedClipboardEventRegister(&pClient->Events, uEvent);
+            rc = ShClEventRegister(&pClient->Events, uEvent);
             if (RT_SUCCESS(rc))
             {
                 PSHCLEVENTPAYLOAD pPayload;
-                rc = SharedClipboardEventWait(&pClient->Events, uEvent, 30 * 1000, &pPayload);
+                rc = ShClEventWait(&pClient->Events, uEvent, 30 * 1000, &pPayload);
                 if (RT_SUCCESS(rc))
                 {
@@ -247 +247 @@
                 }
 
-                SharedClipboardEventUnregister(&pClient->Events, uEvent);
+                ShClEventUnregister(&pClient->Events, uEvent);
             }
         }
@@ -292 +292 @@
 
     PSHCLEVENTPAYLOAD pPayload;
-    int rc2 = SharedClipboardPayloadAlloc(pReq->uEvent, pv, cb, &pPayload);
+    int rc2 = ShClPayloadAlloc(pReq->uEvent, pv, cb, &pPayload);
     if (RT_SUCCESS(rc2))
-        rc2 = SharedClipboardEventSignal(&pCtx->pClient->Events, pReq->uEvent, pPayload);
+        rc2 = ShClEventSignal(&pCtx->pClient->Events, pReq->uEvent, pPayload);
 
     AssertRC(rc);
@@ -335 +335 @@
     {
         PSHCLEVENTPAYLOAD pPayload;
-        rc = SharedClipboardEventWait(&pCtx->pClient->Events, uEvent, 30 * 1000, &pPayload);
+        rc = ShClEventWait(&pCtx->pClient->Events, uEvent, 30 * 1000, &pPayload);
         if (RT_SUCCESS(rc))
         {
@@ -342 +342 @@
 
             /* Detach the payload, as the caller then will own the data. */
-            SharedClipboardEventPayloadDetach(&pCtx->pClient->Events, uEvent);
-        }
-
-        SharedClipboardEventUnregister(&pCtx->pClient->Events, uEvent);
+            ShClEventPayloadDetach(&pCtx->pClient->Events, uEvent);
+        }
+
+        ShClEventUnregister(&pCtx->pClient->Events, uEvent);
     }
 

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

@@ -473 +473 @@
 
     LogFlowFunc(("uMsg=%RU32 (%s), cParms=%RU32, fAppend=%RTbool\n",
-                 pMsg->uMsg, VBoxShClHostMsgToStr(pMsg->uMsg), pMsg->cParms, fAppend));
+                 pMsg->uMsg, ShClHostMsgToStr(pMsg->uMsg), pMsg->cParms, fAppend));
 
     if (fAppend)
@@ -550 +550 @@
             shclSvcMsgSetPeekReturn(pFirstMsg, paParms, cParms);
             LogFlowFunc(("[Client %RU32] VBOX_SHCL_GUEST_FN_MSG_PEEK_XXX -> VINF_SUCCESS (idMsg=%u (%s), cParms=%u)\n",
-                         pClient->State.uClientID, pFirstMsg->uMsg, VBoxShClHostMsgToStr(pFirstMsg->uMsg),
+                         pClient->State.uClientID, pFirstMsg->uMsg, ShClHostMsgToStr(pFirstMsg->uMsg),
                          pFirstMsg->cParms));
             return VINF_SUCCESS;
@@ -611 +611 @@
 
             LogFlowFunc(("[Client %RU32] uMsg=%RU32 (%s), cParms=%RU32\n",
-                         pClient->State.uClientID, pFirstMsg->uMsg, VBoxShClHostMsgToStr(pFirstMsg->uMsg),
+                         pClient->State.uClientID, pFirstMsg->uMsg, ShClHostMsgToStr(pFirstMsg->uMsg),
                          pFirstMsg->cParms));
 
@@ -684 +684 @@
         {
             LogFlowFunc(("First message is: %RU32 (%s), cParms=%RU32\n",
-                         pFirstMsg->uMsg, VBoxShClHostMsgToStr(pFirstMsg->uMsg), pFirstMsg->cParms));
+                         pFirstMsg->uMsg, ShClHostMsgToStr(pFirstMsg->uMsg), pFirstMsg->cParms));
 
             ASSERT_GUEST_MSG_RETURN(pFirstMsg->uMsg == idMsgExpected || idMsgExpected == UINT32_MAX,
                                     ("idMsg=%u (%s) cParms=%u, caller expected %u (%s) and %u\n",
-                                     pFirstMsg->uMsg, VBoxShClHostMsgToStr(pFirstMsg->uMsg), pFirstMsg->cParms,
-                                     idMsgExpected, VBoxShClHostMsgToStr(idMsgExpected), cParms),
+                                     pFirstMsg->uMsg, ShClHostMsgToStr(pFirstMsg->uMsg), pFirstMsg->cParms,
+                                     idMsgExpected, ShClHostMsgToStr(idMsgExpected), cParms),
                                     VERR_MISMATCH);
             ASSERT_GUEST_MSG_RETURN(pFirstMsg->cParms == cParms,
                                     ("idMsg=%u (%s) cParms=%u, caller expected %u (%s) and %u\n",
-                                     pFirstMsg->uMsg, VBoxShClHostMsgToStr(pFirstMsg->uMsg), pFirstMsg->cParms,
-                                     idMsgExpected, VBoxShClHostMsgToStr(idMsgExpected), cParms),
+                                     pFirstMsg->uMsg, ShClHostMsgToStr(pFirstMsg->uMsg), pFirstMsg->cParms,
+                                     idMsgExpected, ShClHostMsgToStr(idMsgExpected), cParms),
                                     VERR_WRONG_PARAMETER_COUNT);
 
@@ -701 +701 @@
                 ASSERT_GUEST_MSG_RETURN(pFirstMsg->paParms[i].type == paParms[i].type,
                                         ("param #%u: type %u, caller expected %u (idMsg=%u %s)\n", i, pFirstMsg->paParms[i].type,
-                                         paParms[i].type, pFirstMsg->uMsg, VBoxShClHostMsgToStr(pFirstMsg->uMsg)),
+                                         paParms[i].type, pFirstMsg->uMsg, ShClHostMsgToStr(pFirstMsg->uMsg)),
                                         VERR_WRONG_PARAMETER_TYPE);
             /*
@@ -797 +797 @@
             {
                 LogFunc(("[Client %RU32] Current host message is %RU32 (%s), cParms=%RU32\n",
-                         pClient->State.uClientID, pFirstMsg->uMsg, VBoxShClHostMsgToStr(pFirstMsg->uMsg),
+                         pClient->State.uClientID, pFirstMsg->uMsg, ShClHostMsgToStr(pFirstMsg->uMsg),
                          pFirstMsg->cParms));
 
@@ -866 +866 @@
     if (pMsgReadData)
     {
-        const SHCLEVENTID uEvent = SharedClipboardEventIDGenerate(&pClient->Events);
+        const SHCLEVENTID uEvent = ShClEventIDGenerate(&pClient->Events);
 
         HGCMSvcSetU32(&pMsgReadData->paParms[0], VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID,
@@ -876 +876 @@
         if (RT_SUCCESS(rc))
         {
-            rc = SharedClipboardEventRegister(&pClient->Events, uEvent);
+            rc = ShClEventRegister(&pClient->Events, uEvent);
             if (RT_SUCCESS(rc))
             {
@@ -886 +886 @@
                 }
                 else
-                    SharedClipboardEventUnregister(&pClient->Events, uEvent);
+                    ShClEventUnregister(&pClient->Events, uEvent);
             }
         }
@@ -909 +909 @@
         /* Protocol v0 did not have any context ID handling, so we ASSUME that the last event registered
          * is the one we want to handle (as this all was a synchronous protocol anyway). */
-        uEvent = SharedClipboardEventGetLast(&pClient->Events);
+        uEvent = ShClEventGetLast(&pClient->Events);
     }
     else
@@ -918 +918 @@
     PSHCLEVENTPAYLOAD pPayload = NULL;
     if (pData->cbData)
-        rc = SharedClipboardPayloadAlloc(uEvent, pData->pvData, pData->cbData, &pPayload);
+        rc = ShClPayloadAlloc(uEvent, pData->pvData, pData->cbData, &pPayload);
 
     if (RT_SUCCESS(rc))
     {
-        rc = SharedClipboardEventSignal(&pClient->Events, uEvent, pPayload);
+        rc = ShClEventSignal(&pClient->Events, uEvent, pPayload);
         if (RT_FAILURE(rc))
-            SharedClipboardPayloadFree(pPayload);
+            ShClPayloadFree(pPayload);
     }
 
@@ -941 +941 @@
     if (pMsg)
     {
-        const SHCLEVENTID uEvent = SharedClipboardEventIDGenerate(&pClient->Events);
+        const SHCLEVENTID uEvent = ShClEventIDGenerate(&pClient->Events);
 
         HGCMSvcSetU32(&pMsg->paParms[0], VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID,
@@ -1121 +1121 @@
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-    PSHCLTRANSFER pTransfer = SharedClipboardTransferCtxGetTransfer(&pClient->TransferCtx, 0 /* Index*/);
+    PSHCLTRANSFER pTransfer = ShClTransferCtxGetTransfer(&pClient->TransferCtx, 0 /* Index*/);
     if (pTransfer)
         shclSvcTransferAreaDetach(&pClient->State, pTransfer);
 
-    SharedClipboardTransferCtxDestroy(&pClient->TransferCtx);
+    ShClTransferCtxDestroy(&pClient->TransferCtx);
 #endif
 
@@ -1145 +1145 @@
     shclSvcClientStateDestroy(&pClient->State);
 
-    SharedClipboardEventSourceDestroy(&pClient->Events);
+    ShClEventSourceDestroy(&pClient->Events);
 
     ClipboardClientMap::iterator itClient = g_mapClients.find(u32ClientID);
@@ -1169 +1169 @@
 
     /* Create the client's own event source. */
-    int rc = SharedClipboardEventSourceCreate(&pClient->Events, 0 /* ID, ignored */);
+    int rc = ShClEventSourceCreate(&pClient->Events, 0 /* ID, ignored */);
     if (RT_SUCCESS(rc))
     {
@@ -1182 +1182 @@
         {
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
-            rc = SharedClipboardTransferCtxInit(&pClient->TransferCtx);
+            rc = ShClTransferCtxInit(&pClient->TransferCtx);
 #endif
             if (RT_SUCCESS(rc))
@@ -1222 +1222 @@
 
     LogFunc(("u32ClientID=%RU32 (proto %RU32), fn=%RU32 (%s), cParms=%RU32, paParms=%p\n",
-             u32ClientID, pClient->State.uProtocolVer, u32Function, VBoxShClGuestMsgToStr(u32Function), cParms, paParms));
+             u32ClientID, pClient->State.uProtocolVer, u32Function, ShClGuestMsgToStr(u32Function), cParms, paParms));
 
 #ifdef DEBUG
@@ -1568 +1568 @@
 
     LogFlowFunc(("u32Function=%RU32 (%s), cParms=%RU32, paParms=%p\n",
-                 u32Function, VBoxShClHostFunctionToStr(u32Function), cParms, paParms));
+                 u32Function, ShClHostFunctionToStr(u32Function), cParms, paParms));
 
     switch (u32Function)

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

@@ -208 +208 @@
                 size_t cwSrc = RTUtf16Len(pwszTmp);
                 size_t cwDest;
-                rc = vboxClipboardUtf16GetWinSize(pwszTmp, cwSrc, &cwDest);
+                rc = ShClUtf16GetWinSize(pwszTmp, cwSrc, &cwDest);
                 if (RT_FAILURE(rc))
                 {
@@ -222 +222 @@
                 if (*pcbActual <= cb)
                 {
-                    rc = vboxClipboardUtf16LinToWin(pwszTmp, RTUtf16Len(pwszTmp), static_cast <PRTUTF16>(pv), cb / 2);
+                    rc = ShClUtf16LinToWin(pwszTmp, RTUtf16Len(pwszTmp), static_cast <PRTUTF16>(pv), cb / 2);
                     if (RT_FAILURE(rc))
                     {
@@ -254 +254 @@
                 const void *pDib;
                 size_t cbDibSize;
-                rc = vboxClipboardBmpGetDib(pTmp, cbTmpSize, &pDib, &cbDibSize);
+                rc = ShClBmpGetDib(pTmp, cbTmpSize, &pDib, &cbDibSize);
                 if (RT_FAILURE(rc))
                 {
@@ -311 +311 @@
         size_t cwDest = 0;
         /* How long will the converted text be? */
-        rc = vboxClipboardUtf16GetLinSize(pwszSrcText, cwSrc, &cwDest);
+        rc = ShClUtf16GetLinSize(pwszSrcText, cwSrc, &cwDest);
         if (RT_FAILURE(rc))
         {
@@ -331 +331 @@
         }
         /* Convert the EOL */
-        rc = vboxClipboardUtf16WinToLin(pwszSrcText, cwSrc, pwszDestText, cwDest);
+        rc = ShClUtf16WinToLin(pwszSrcText, cwSrc, pwszDestText, cwDest);
         if (RT_FAILURE(rc))
         {
@@ -381 +381 @@
         PasteboardItemID itemId = (PasteboardItemID)1;
 
-        rc = vboxClipboardDibToBmp(pv, cb, &pBmp, &cbBmpSize);
+        rc = ShClDibToBmp(pv, cb, &pBmp, &cbBmpSize);
         if (RT_SUCCESS(rc))
         {