VirtualBox

Changeset 100643 in vbox for trunk


Ignore:
Timestamp:
Jul 19, 2023 8:40:06 AM (15 months ago)
Author:
vboxsync
Message:

Shared Clipboard: Renaming. bugref:9437

File:
1 edited

Legend:

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

    r100642 r100643  
    21662166 * @param   idTransfer          Transfer ID to report status for.
    21672167 * @param   enmDir              Transfer direction to report status for.
    2168  * @param   uStatus             Status to report.
     2168 * @param   enmSts              Status to report.
    21692169 * @param   rcTransfer          Result code to report. Optional and depending on status.
    21702170 * @param   ppEvent             Where to return the wait event on success. Optional.
     
    21732173 * @note    Caller must enter the client's critical section.
    21742174 */
    2175 static int shClSvcTransferSendStatusExAsync(PSHCLCLIENT pClient, SHCLTRANSFERID idTransfer, SHCLTRANSFERDIR enmDir, SHCLTRANSFERSTATUS uStatus,
    2176                                             int rcTransfer, PSHCLEVENT *ppEvent)
     2175static int shClSvcTransferSendStatusExAsync(PSHCLCLIENT pClient, SHCLTRANSFERID idTransfer,
     2176                                            SHCLTRANSFERDIR enmDir, SHCLTRANSFERSTATUS enmSts, int rcTransfer,
     2177                                            PSHCLEVENT *ppEvent)
    21772178{
    21782179    AssertPtrReturn(pClient, VERR_INVALID_POINTER);
     
    21932194        HGCMSvcSetU64(&pMsgReadData->aParms[0], VBOX_SHCL_CONTEXTID_MAKE(pClient->State.uSessionID, idTransfer, pEvent->idEvent));
    21942195        HGCMSvcSetU32(&pMsgReadData->aParms[1], enmDir);
    2195         HGCMSvcSetU32(&pMsgReadData->aParms[2], uStatus);
     2196        HGCMSvcSetU32(&pMsgReadData->aParms[2], enmSts);
    21962197        HGCMSvcSetU32(&pMsgReadData->aParms[3], (uint32_t)rcTransfer); /** @todo uint32_t vs. int. */
    21972198        HGCMSvcSetU32(&pMsgReadData->aParms[4], 0 /* fFlags, unused */);
     
    22032204        {
    22042205            LogRel2(("Shared Clipboard: Reported status %s (rc=%Rrc) of transfer %RU32 to guest\n",
    2205                      ShClTransferStatusToStr(uStatus), rcTransfer, idTransfer));
     2206                     ShClTransferStatusToStr(enmSts), rcTransfer, idTransfer));
    22062207
    22072208            if (ppEvent)
     
    22202221    if (RT_FAILURE(rc))
    22212222        LogRel(("Shared Clipboard: Reporting status %s (%Rrc) for transfer %RU32 to guest failed with %Rrc\n",
    2222                 ShClTransferStatusToStr(uStatus), rcTransfer, idTransfer, rc));
     2223                ShClTransferStatusToStr(enmSts), rcTransfer, idTransfer, rc));
    22232224
    22242225    LogFlowFuncLeaveRC(rc);
     
    22322233 * @param   pClient             Client that owns the transfer.
    22332234 * @param   pTransfer           Transfer to report status for.
    2234  * @param   uStatus             Status to report.
     2235 * @param   enmSts              Status to report.
    22352236 * @param   rcTransfer          Result code to report. Optional and depending on status.
    22362237 * @param   ppEvent             Where to return the wait event on success. Optional.
     
    22392240 * @note    Caller must enter the client's critical section.
    22402241 */
    2241 static int shClSvcTransferSendStatusAsync(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer, SHCLTRANSFERSTATUS uStatus,
     2242static int shClSvcTransferSendStatusAsync(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer, SHCLTRANSFERSTATUS enmSts,
    22422243                                          int rcTransfer, PSHCLEVENT *ppEvent)
    22432244{
     
    22472248
    22482249   return shClSvcTransferSendStatusExAsync(pClient, ShClTransferGetID(pTransfer), ShClTransferGetDir(pTransfer),
    2249                                            uStatus, rcTransfer, ppEvent);
     2250                                           enmSts, rcTransfer, ppEvent);
    22502251}
    22512252
     
    22562257 * @param   pClient             Client that owns the transfer.
    22572258 * @param   pTransfer           Transfer to report status for.
    2258  * @param   uStatus             Status to report.
     2259 * @param   enmSts              Status to report.
    22592260 * @param   rcTransfer          Result code to report. Optional and depending on status.
    22602261 * @param   ppEvent             Where to return the wait event on success. Optional.
    22612262 *                              Must be released by the caller with ShClEventRelease().
    22622263 */
    2263 int ShClSvcTransferSendStatusAsync(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer, SHCLTRANSFERSTATUS uStatus,
     2264int ShClSvcTransferSendStatusAsync(PSHCLCLIENT pClient, PSHCLTRANSFER pTransfer, SHCLTRANSFERSTATUS enmSts,
    22642265                                   int rcTransfer, PSHCLEVENT *ppEvent)
    22652266{
    2266     return shClSvcTransferSendStatusAsync(pClient, pTransfer, uStatus, rcTransfer, ppEvent);
     2267    return shClSvcTransferSendStatusAsync(pClient, pTransfer, enmSts, rcTransfer, ppEvent);
    22672268}
    22682269
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