VirtualBox

Changeset 103630 in vbox


Ignore:
Timestamp:
Mar 1, 2024 10:44:58 AM (9 months ago)
Author:
vboxsync
Message:

Shared Clipboard: More cleanups (renaming, removed dead code). bugref:9437

Location:
trunk/src/VBox/HostServices/SharedClipboard
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r100655 r103630  
    465465 * @{
    466466 */
    467 int shClSvcTransferHandler(PSHCLCLIENT pClient, VBOXHGCMCALLHANDLE callHandle, uint32_t u32Function,
    468                            uint32_t cParms, VBOXHGCMSVCPARM paParms[], uint64_t tsArrival);
    469 int shClSvcTransferHostHandler(uint32_t u32Function, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
     467int ShClSvcTransferMsgClientHandler(PSHCLCLIENT pClient, VBOXHGCMCALLHANDLE callHandle, uint32_t u32Function, uint32_t cParms, VBOXHGCMSVCPARM paParms[], uint64_t tsArrival);
     468int ShClSvcTransferMsgHostHandler(uint32_t u32Function, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
    470469/** @} */
    471470
    … …  
    473472 * @{
    474473 */
    475 DECLCALLBACK(int) shClSvcTransferIfaceGHRootListRead(PSHCLTXPROVIDERCTX pCtx);
    476 DECLCALLBACK(int) shClSvcTransferIfaceGHListOpen(PSHCLTXPROVIDERCTX pCtx, PSHCLLISTOPENPARMS pOpenParms, PSHCLLISTHANDLE phList);
    477 DECLCALLBACK(int) shClSvcTransferIfaceGHListClose(PSHCLTXPROVIDERCTX pCtx, SHCLLISTHANDLE hList);
    478 DECLCALLBACK(int) shClSvcTransferIfaceGHListHdrRead(PSHCLTXPROVIDERCTX pCtx, SHCLLISTHANDLE hList, PSHCLLISTHDR pListHdr);
    479 DECLCALLBACK(int) shClSvcTransferIfaceGHListEntryRead(PSHCLTXPROVIDERCTX pCtx, SHCLLISTHANDLE hList, PSHCLLISTENTRY pListEntry);
    480 DECLCALLBACK(int) shClSvcTransferIfaceGHObjOpen(PSHCLTXPROVIDERCTX pCtx, PSHCLOBJOPENCREATEPARMS pCreateParms, PSHCLOBJHANDLE phObj);
    481 DECLCALLBACK(int) shClSvcTransferIfaceGHObjClose(PSHCLTXPROVIDERCTX pCtx, SHCLOBJHANDLE hObj);
    482 DECLCALLBACK(int) shClSvcTransferIfaceGHObjRead(PSHCLTXPROVIDERCTX pCtx, SHCLOBJHANDLE hObj, void *pvData, uint32_t cbData, uint32_t fFlags, uint32_t *pcbRead);
    483 /** @} */
    484 
    485 /** @name Shared Clipboard transfer interface implementations for host -> guest transfers.
    486  * @{
    487  */
    488 DECLCALLBACK(int) shClSvcTransferIfaceHGListHdrWrite(PSHCLTXPROVIDERCTX pCtx, SHCLLISTHANDLE hList, PSHCLLISTHDR pListHdr);
    489 DECLCALLBACK(int) shClSvcTransferIfaceHGListEntryWrite(PSHCLTXPROVIDERCTX pCtx, SHCLLISTHANDLE hList, PSHCLLISTENTRY pListEntry);
    490 DECLCALLBACK(int) shClSvcTransferIfaceHGObjWrite(PSHCLTXPROVIDERCTX pCtx, SHCLOBJHANDLE hObj, void *pvData, uint32_t cbData, uint32_t fFlags, uint32_t *pcbWritten);
    491 /** @} */
    492 
    493 /** @name Shared Clipboard transfer callbacks for the host service.
    494  * @{
    495  */
    496 DECLCALLBACK(void) VBoxSvcClipboardTransferPrepareCallback(PSHCLTXPROVIDERCTX pCtx);
    497 DECLCALLBACK(void) VBoxSvcClipboardDataHeaderCompleteCallback(PSHCLTXPROVIDERCTX pCtx);
    498 DECLCALLBACK(void) VBoxSvcClipboardDataCompleteCallback(PSHCLTXPROVIDERCTX pCtx);
    499 DECLCALLBACK(void) VBoxSvcClipboardTransferCompleteCallback(PSHCLTXPROVIDERCTX pCtx, int rc);
    500 DECLCALLBACK(void) VBoxSvcClipboardTransferCanceledCallback(PSHCLTXPROVIDERCTX pCtx);
    501 DECLCALLBACK(void) VBoxSvcClipboardTransferErrorCallback(PSHCLTXPROVIDERCTX pCtx, int rc);
     474DECLCALLBACK(int) ShClSvcTransferIfaceGHRootListRead(PSHCLTXPROVIDERCTX pCtx);
     475DECLCALLBACK(int) ShClSvcTransferIfaceGHListOpen(PSHCLTXPROVIDERCTX pCtx, PSHCLLISTOPENPARMS pOpenParms, PSHCLLISTHANDLE phList);
     476DECLCALLBACK(int) ShClSvcTransferIfaceGHListClose(PSHCLTXPROVIDERCTX pCtx, SHCLLISTHANDLE hList);
     477DECLCALLBACK(int) ShClSvcTransferIfaceGHListHdrRead(PSHCLTXPROVIDERCTX pCtx, SHCLLISTHANDLE hList, PSHCLLISTHDR pListHdr);
     478DECLCALLBACK(int) ShClSvcTransferIfaceGHListEntryRead(PSHCLTXPROVIDERCTX pCtx, SHCLLISTHANDLE hList, PSHCLLISTENTRY pListEntry);
     479DECLCALLBACK(int) ShClSvcTransferIfaceGHObjOpen(PSHCLTXPROVIDERCTX pCtx, PSHCLOBJOPENCREATEPARMS pCreateParms, PSHCLOBJHANDLE phObj);
     480DECLCALLBACK(int) ShClSvcTransferIfaceGHObjClose(PSHCLTXPROVIDERCTX pCtx, SHCLOBJHANDLE hObj);
     481DECLCALLBACK(int) ShClSvcTransferIfaceGHObjRead(PSHCLTXPROVIDERCTX pCtx, SHCLOBJHANDLE hObj, void *pvData, uint32_t cbData, uint32_t fFlags, uint32_t *pcbRead);
    502482/** @} */
    503483#endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */

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

    r103480 r103630  
    279279
    280280/** @copydoc SHCLTXPROVIDERIFACE::pfnRootListRead */
    281 DECLCALLBACK(int) shClSvcTransferIfaceGHRootListRead(PSHCLTXPROVIDERCTX pCtx)
     281DECLCALLBACK(int) ShClSvcTransferIfaceGHRootListRead(PSHCLTXPROVIDERCTX pCtx)
    282282{
    283283    LogFlowFuncEnter();
    … …  
    307307
    308308/** @copydoc SHCLTXPROVIDERIFACE::pfnListOpen */
    309 DECLCALLBACK(int) shClSvcTransferIfaceGHListOpen(PSHCLTXPROVIDERCTX pCtx,
     309DECLCALLBACK(int) ShClSvcTransferIfaceGHListOpen(PSHCLTXPROVIDERCTX pCtx,
    310310                                                 PSHCLLISTOPENPARMS pOpenParms, PSHCLLISTHANDLE phList)
    311311{
    … …  
    381381
    382382/** @copydoc SHCLTXPROVIDERIFACE::pfnListClose */
    383 DECLCALLBACK(int) shClSvcTransferIfaceGHListClose(PSHCLTXPROVIDERCTX pCtx, SHCLLISTHANDLE hList)
     383DECLCALLBACK(int) ShClSvcTransferIfaceGHListClose(PSHCLTXPROVIDERCTX pCtx, SHCLLISTHANDLE hList)
    384384{
    385385    LogFlowFuncEnter();
    … …  
    441441
    442442/** @copydoc SHCLTXPROVIDERIFACE::pfnListHdrRead */
    443 DECLCALLBACK(int) shClSvcTransferIfaceGHListHdrRead(PSHCLTXPROVIDERCTX pCtx,
     443DECLCALLBACK(int) ShClSvcTransferIfaceGHListHdrRead(PSHCLTXPROVIDERCTX pCtx,
    444444                                                    SHCLLISTHANDLE hList, PSHCLLISTHDR pListHdr)
    445445{
    … …  
    503503}
    504504
    505 /** @copydoc SHCLTXPROVIDERIFACE::pfnListHdrWrite */
    506 DECLCALLBACK(int) shClSvcTransferIfaceHGListHdrWrite(PSHCLTXPROVIDERCTX pCtx,
    507                                                      SHCLLISTHANDLE hList, PSHCLLISTHDR pListHdr)
    508 {
    509     RT_NOREF(pCtx, hList, pListHdr);
    510 
    511     LogFlowFuncEnter();
    512 
    513     return VERR_NOT_IMPLEMENTED;
    514 }
    515 
    516505/** @copydoc SHCLTXPROVIDERIFACE::pfnListEntryRead */
    517 DECLCALLBACK(int) shClSvcTransferIfaceGHListEntryRead(PSHCLTXPROVIDERCTX pCtx,
     506DECLCALLBACK(int) ShClSvcTransferIfaceGHListEntryRead(PSHCLTXPROVIDERCTX pCtx,
    518507                                                      SHCLLISTHANDLE hList, PSHCLLISTENTRY pListEntry)
    519508{
    … …  
    577566}
    578567
    579 /** @copydoc SHCLTXPROVIDERIFACE::pfnListEntryWrite */
    580 DECLCALLBACK(int) shClSvcTransferIfaceHGListEntryWrite(PSHCLTXPROVIDERCTX pCtx,
    581                                                        SHCLLISTHANDLE hList, PSHCLLISTENTRY pListEntry)
    582 {
    583     RT_NOREF(pCtx, hList, pListEntry);
    584 
    585     LogFlowFuncEnter();
    586 
    587     return VERR_NOT_IMPLEMENTED;
    588 }
    589 
    590568/** @copydoc SHCLTXPROVIDERIFACE::pfnObjOpen */
    591 DECLCALLBACK(int) shClSvcTransferIfaceGHObjOpen(PSHCLTXPROVIDERCTX pCtx, PSHCLOBJOPENCREATEPARMS pCreateParms, PSHCLOBJHANDLE phObj)
     569DECLCALLBACK(int) ShClSvcTransferIfaceGHObjOpen(PSHCLTXPROVIDERCTX pCtx, PSHCLOBJOPENCREATEPARMS pCreateParms, PSHCLOBJHANDLE phObj)
    592570{
    593571    LogFlowFuncEnter();
    … …  
    667645
    668646/** @copydoc SHCLTXPROVIDERIFACE::pfnObjClose */
    669 DECLCALLBACK(int) shClSvcTransferIfaceGHObjClose(PSHCLTXPROVIDERCTX pCtx, SHCLOBJHANDLE hObj)
     647DECLCALLBACK(int) ShClSvcTransferIfaceGHObjClose(PSHCLTXPROVIDERCTX pCtx, SHCLOBJHANDLE hObj)
    670648{
    671649    LogFlowFuncEnter();
    … …  
    733711
    734712/** @copydoc SHCLTXPROVIDERIFACE::pfnObjRead */
    735 DECLCALLBACK(int) shClSvcTransferIfaceGHObjRead(PSHCLTXPROVIDERCTX pCtx, SHCLOBJHANDLE hObj,
     713DECLCALLBACK(int) ShClSvcTransferIfaceGHObjRead(PSHCLTXPROVIDERCTX pCtx, SHCLOBJHANDLE hObj,
    736714                                                void *pvData, uint32_t cbData, uint32_t fFlags, uint32_t *pcbRead)
    737715{
    … …  
    782760                    if (pcbRead)
    783761                        *pcbRead = cbRead;
    784 
    785                     ShClPayloadFree(pPayload);
    786                 }
    787                 else
    788                     rc = rcEvent;
    789             }
    790 
    791             ShClEventRelease(pEvent);
    792         }
    793         else
    794         {
    795             shClSvcMsgFree(pClient, pMsg);
    796             rc = VERR_SHCLPB_MAX_EVENTS_REACHED;
    797         }
    798     }
    799     else
    800         rc = VERR_NO_MEMORY;
    801 
    802     LogFlowFuncLeaveRC(rc);
    803     return rc;
    804 }
    805 
    806 /** @copydoc SHCLTXPROVIDERIFACE::pfnObjWrite */
    807 DECLCALLBACK(int) shClSvcTransferIfaceHGObjWrite(PSHCLTXPROVIDERCTX pCtx, SHCLOBJHANDLE hObj,
    808                                                  void *pvData, uint32_t cbData, uint32_t fFlags, uint32_t *pcbWritten)
    809 {
    810     LogFlowFuncEnter();
    811 
    812     PSHCLCLIENT pClient = (PSHCLCLIENT)pCtx->pvUser;
    813     AssertPtr(pClient);
    814 
    815     int rc;
    816 
    817     PSHCLCLIENTMSG pMsg = shClSvcMsgAlloc(pClient, VBOX_SHCL_HOST_MSG_TRANSFER_OBJ_WRITE,
    818                                           VBOX_SHCL_CPARMS_OBJ_WRITE);
    819     if (pMsg)
    820     {
    821         PSHCLEVENT pEvent;
    822         rc = ShClEventSourceGenerateAndRegisterEvent(&pCtx->pTransfer->Events, &pEvent);
    823         if (RT_SUCCESS(rc))
    824         {
    825             HGCMSvcSetU64(&pMsg->aParms[0], VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID,
    826                                                                      pCtx->pTransfer->State.uID, pEvent->idEvent));
    827             HGCMSvcSetU64(&pMsg->aParms[1], hObj);
    828             HGCMSvcSetU64(&pMsg->aParms[2], cbData);
    829             HGCMSvcSetU64(&pMsg->aParms[3], fFlags);
    830 
    831             shClSvcClientLock(pClient);
    832 
    833             shClSvcMsgAdd(pClient, pMsg, true /* fAppend */);
    834             rc = shClSvcClientWakeup(pClient);
    835 
    836             shClSvcClientUnlock(pClient);
    837 
    838             if (RT_SUCCESS(rc))
    839             {
    840                 int               rcEvent;
    841                 PSHCLEVENTPAYLOAD pPayload;
    842                 rc = ShClEventWaitEx(pEvent, pCtx->pTransfer->uTimeoutMs, &rcEvent, &pPayload);
    843                 if (RT_SUCCESS(rc))
    844                 {
    845                     const uint32_t cbRead = RT_MIN(cbData, pPayload->cbData);
    846 
    847                     memcpy(pvData, pPayload->pvData, cbRead);
    848 
    849                     if (pcbWritten)
    850                         *pcbWritten = cbRead;
    851762
    852763                    ShClPayloadFree(pPayload);
    … …  
    16621573
    16631574/**
    1664  * Transfer client (guest) handler for the Shared Clipboard host service.
     1575 * Transfer message client (guest) handler for the Shared Clipboard host service.
    16651576 *
    16661577 * @returns VBox status code, or VINF_HGCM_ASYNC_EXECUTE if returning to the client will be deferred.
    … …  
    16721583 * @param   tsArrival           Timestamp of arrival.
    16731584 */
    1674 int shClSvcTransferHandler(PSHCLCLIENT pClient,
    1675                            VBOXHGCMCALLHANDLE callHandle,
    1676                            uint32_t u32Function,
    1677                            uint32_t cParms,
    1678                            VBOXHGCMSVCPARM aParms[],
    1679                            uint64_t tsArrival)
     1585int ShClSvcTransferMsgClientHandler(PSHCLCLIENT pClient,
     1586                                    VBOXHGCMCALLHANDLE callHandle,
     1587                                    uint32_t u32Function,
     1588                                    uint32_t cParms,
     1589                                    VBOXHGCMSVCPARM aParms[],
     1590                                    uint64_t tsArrival)
    16801591{
    16811592    RT_NOREF(callHandle, aParms, tsArrival);
    … …  
    21162027
    21172028/**
    2118  * Transfer host handler for the Shared Clipboard host service.
     2029 * Transfer message host handler for the Shared Clipboard host service.
    21192030 *
    21202031 * @returns VBox status code.
    … …  
    21232034 * @param   aParms              Array function parameters supplied.
    21242035 */
    2125 int shClSvcTransferHostHandler(uint32_t u32Function,
    2126                                uint32_t cParms,
    2127                                VBOXHGCMSVCPARM aParms[])
     2036int ShClSvcTransferMsgHostHandler(uint32_t u32Function,
     2037                                  uint32_t cParms,
     2038                                  VBOXHGCMSVCPARM aParms[])
    21282039{
    21292040    RT_NOREF(cParms, aParms);

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

    r103615 r103630  
    254254        case SHCLTRANSFERDIR_FROM_REMOTE: /* G->H */
    255255        {
    256             pIface->pfnRootListRead  = shClSvcTransferIfaceGHRootListRead;
    257 
    258             pIface->pfnListOpen      = shClSvcTransferIfaceGHListOpen;
    259             pIface->pfnListClose     = shClSvcTransferIfaceGHListClose;
    260             pIface->pfnListHdrRead   = shClSvcTransferIfaceGHListHdrRead;
    261             pIface->pfnListEntryRead = shClSvcTransferIfaceGHListEntryRead;
    262 
    263             pIface->pfnObjOpen       = shClSvcTransferIfaceGHObjOpen;
    264             pIface->pfnObjClose      = shClSvcTransferIfaceGHObjClose;
    265             pIface->pfnObjRead       = shClSvcTransferIfaceGHObjRead;
     256            pIface->pfnRootListRead  = ShClSvcTransferIfaceGHRootListRead;
     257
     258            pIface->pfnListOpen      = ShClSvcTransferIfaceGHListOpen;
     259            pIface->pfnListClose     = ShClSvcTransferIfaceGHListClose;
     260            pIface->pfnListHdrRead   = ShClSvcTransferIfaceGHListHdrRead;
     261            pIface->pfnListEntryRead = ShClSvcTransferIfaceGHListEntryRead;
     262
     263            pIface->pfnObjOpen       = ShClSvcTransferIfaceGHObjOpen;
     264            pIface->pfnObjClose      = ShClSvcTransferIfaceGHObjClose;
     265            pIface->pfnObjRead       = ShClSvcTransferIfaceGHObjRead;
    266266            break;
    267267        }

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

    r103442 r103630  
    382382        case SHCLTRANSFERDIR_FROM_REMOTE: /* Guest -> Host. */
    383383        {
    384             pIface->pfnRootListRead  = shClSvcTransferIfaceGHRootListRead;
    385 
    386             pIface->pfnListOpen      = shClSvcTransferIfaceGHListOpen;
    387             pIface->pfnListClose     = shClSvcTransferIfaceGHListClose;
    388             pIface->pfnListHdrRead   = shClSvcTransferIfaceGHListHdrRead;
    389             pIface->pfnListEntryRead = shClSvcTransferIfaceGHListEntryRead;
    390 
    391             pIface->pfnObjOpen       = shClSvcTransferIfaceGHObjOpen;
    392             pIface->pfnObjClose      = shClSvcTransferIfaceGHObjClose;
    393             pIface->pfnObjRead       = shClSvcTransferIfaceGHObjRead;
     384            pIface->pfnRootListRead  = ShClSvcTransferIfaceGHRootListRead;
     385
     386            pIface->pfnListOpen      = ShClSvcTransferIfaceGHListOpen;
     387            pIface->pfnListClose     = ShClSvcTransferIfaceGHListClose;
     388            pIface->pfnListHdrRead   = ShClSvcTransferIfaceGHListHdrRead;
     389            pIface->pfnListEntryRead = ShClSvcTransferIfaceGHListEntryRead;
     390
     391            pIface->pfnObjOpen       = ShClSvcTransferIfaceGHObjOpen;
     392            pIface->pfnObjClose      = ShClSvcTransferIfaceGHObjClose;
     393            pIface->pfnObjRead       = ShClSvcTransferIfaceGHObjRead;
    394394            break;
    395395        }

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

    r103426 r103630  
    816816 * @param   paParms     Array of parameters.
    817817 */
    818 static int shClSvcClientQueryFeatures(VBOXHGCMCALLHANDLE hCall, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
     818static int shClSvcClientMsgQueryFeatures(VBOXHGCMCALLHANDLE hCall, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
    819819{
    820820    /*
    … …  
    15951595
    15961596/**
    1597  * Handles the VBOX_SHCL_GUEST_FN_REPORT_FORMATS message from the guest.
    1598  */
    1599 static int shClSvcClientReportFormats(PSHCLCLIENT pClient, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
     1597 * Implements VBOX_SHCL_GUEST_FN_REPORT_FORMATS.
     1598 *
     1599 * @returns VBox status code.
     1600 * @param   pClient      The client state.
     1601 * @param   cParms       Number of parameters.
     1602 * @param   paParms      Array of parameters.
     1603 */
     1604static int shClSvcClientMsgReportFormats(PSHCLCLIENT pClient, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
    16001605{
    16011606    /*
    … …  
    16911696
    16921697/**
     1698 * Implements VBOX_SHCL_GUEST_FN_DATA_READ.
     1699 *
    16931700 * Called when the guest wants to read host clipboard data.
    1694  * Handles the VBOX_SHCL_GUEST_FN_DATA_READ message.
    16951701 *
    16961702 * @returns VBox status code.
    … …  
    17001706 * @param   paParms             Array of HGCM parameters.
    17011707 */
    1702 static int shClSvcClientReadData(PSHCLCLIENT pClient, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
     1708static int shClSvcClientMsgDataRead(PSHCLCLIENT pClient, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
    17031709{
    17041710    LogFlowFuncEnter();
    … …  
    18601866
    18611867/**
     1868 * Implements VBOX_SHCL_GUEST_FN_DATA_WRITE.
     1869 *
    18621870 * Called when the guest writes clipboard data to the host.
    1863  * Handles the VBOX_SHCL_GUEST_FN_DATA_WRITE message.
    18641871 *
    18651872 * @returns VBox status code.
    … …  
    18681875 * @param   paParms             Array of HGCM parameters.
    18691876 */
    1870 static int shClSvcClientWriteData(PSHCLCLIENT pClient, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
     1877static int shClSvcClientMsgDataWrite(PSHCLCLIENT pClient, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
    18711878{
    18721879    LogFlowFuncEnter();
    … …  
    20292036
    20302037/**
    2031  * Gets an error from HGCM service parameters.
     2038 * Implements the VBOX_SHCL_GUEST_FN_ERROR.
    20322039 *
    20332040 * @returns VBox status code.
    … …  
    20362043 * @param   pRc                 Where to store the received error code.
    20372044 */
    2038 static int shClSvcClientError(uint32_t cParms, VBOXHGCMSVCPARM paParms[], int *pRc)
     2045static int shClSvcClientMsgError(uint32_t cParms, VBOXHGCMSVCPARM paParms[], int *pRc)
    20392046{
    20402047    AssertPtrReturn(paParms, VERR_INVALID_PARAMETER);
    … …  
    22272234
    22282235        case VBOX_SHCL_GUEST_FN_QUERY_FEATURES:
    2229             rc = shClSvcClientQueryFeatures(callHandle, cParms, paParms);
     2236            rc = shClSvcClientMsgQueryFeatures(callHandle, cParms, paParms);
    22302237            break;
    22312238
    … …  
    22552262
    22562263        case VBOX_SHCL_GUEST_FN_REPORT_FORMATS:
    2257             rc = shClSvcClientReportFormats(pClient, cParms, paParms);
     2264            rc = shClSvcClientMsgReportFormats(pClient, cParms, paParms);
    22582265            break;
    22592266
    22602267        case VBOX_SHCL_GUEST_FN_DATA_READ:
    2261             rc = shClSvcClientReadData(pClient, cParms, paParms);
     2268            rc = shClSvcClientMsgDataRead(pClient, cParms, paParms);
    22622269            break;
    22632270
    22642271        case VBOX_SHCL_GUEST_FN_DATA_WRITE:
    2265             rc = shClSvcClientWriteData(pClient, cParms, paParms);
     2272            rc = shClSvcClientMsgDataWrite(pClient, cParms, paParms);
    22662273            break;
    22672274
    … …  
    22692276        {
    22702277            int rcGuest;
    2271             rc = shClSvcClientError(cParms,paParms, &rcGuest);
     2278            rc = shClSvcClientMsgError(cParms,paParms, &rcGuest);
    22722279            if (RT_SUCCESS(rc))
    22732280            {
    … …  
    22952302            {
    22962303                if (g_fTransferMode & VBOX_SHCL_TRANSFER_MODE_F_ENABLED)
    2297                     rc = shClSvcTransferHandler(pClient, callHandle, u32Function, cParms, paParms, tsArrival);
     2304                    rc = ShClSvcTransferMsgClientHandler(pClient, callHandle, u32Function, cParms, paParms, tsArrival);
    22982305                else
    22992306                {
    … …  
    24502457        {
    24512458#ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
    2452             rc = shClSvcTransferHostHandler(u32Function, cParms, paParms);
     2459            rc = ShClSvcTransferMsgHostHandler(u32Function, cParms, paParms);
    24532460#else
    24542461            rc = VERR_NOT_IMPLEMENTED;
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette