VirtualBox

Changeset 80886 in vbox


Ignore:
Timestamp:
Sep 18, 2019 11:27:18 AM (5 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
133461
Message:

Shared Clipboard/Transfers: More renaming, fixed some assertions.

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/GuestHost/SharedClipboard-transfers.h

    r80864 r80886  
    10951095int SharedClipboardTransferSetInterface(PSHCLTRANSFER pTransfer,
    10961096                                           PSHCLPROVIDERCREATIONCTX pCreationCtx);
    1097 int SharedClipboardTransferLTransferSetRoots(PSHCLTRANSFER pTransfer, const char *pszRoots, size_t cbRoots);
     1097int SharedClipboardTransferSetRoots(PSHCLTRANSFER pTransfer, const char *pszRoots, size_t cbRoots);
    10981098void SharedClipboardTransferReset(PSHCLTRANSFER pTransfer);
    10991099SharedClipboardArea *SharedClipboardTransferGetArea(PSHCLTRANSFER pTransfer);
    11001100
    1101 uint32_t SharedClipboardTransferLTransferRootsCount(PSHCLTRANSFER pTransfer);
    1102 int SharedClipboardTransferLTransferRootsEntry(PSHCLTRANSFER pTransfer, uint64_t uIndex, PSHCLROOTLISTENTRY pEntry);
    1103 int SharedClipboardTransferLTransferRootsAsList(PSHCLTRANSFER pTransfer, PSHCLROOTLIST *ppRootList);
     1101uint32_t SharedClipboardTransferRootsCount(PSHCLTRANSFER pTransfer);
     1102int SharedClipboardTransferRootsEntry(PSHCLTRANSFER pTransfer, uint64_t uIndex, PSHCLROOTLISTENTRY pEntry);
     1103int SharedClipboardTransferRootsAsList(PSHCLTRANSFER pTransfer, PSHCLROOTLIST *ppRootList);
    11041104
    11051105SHCLTRANSFERID SharedClipboardTransferGetID(PSHCLTRANSFER pTransfer);

  • trunk/include/VBox/HostServices/VBoxClipboardSvc.h

    r80863 r80886  
    499499    VBoxShClRootListParms ReqParms;
    500500    /** uint64_t, in/out: Number of total root list entries. */
    501     HGCMFunctionParameter      cRoots;
     501    HGCMFunctionParameter cRoots;
    502502} VBoxShClRootListHdrMsg;
    503503
    504 #define VBOX_SHCL_CPARMS_ROOT_LIST_HDR 2
     504#define VBOX_SHCL_CPARMS_ROOT_LIST_HDR 3
    505505
    506506typedef struct _VBoxShClRootListEntryParms
    … …  
    772772{
    773773    /** Current file data chunk. */
    774     void                       *pvData;
     774    void    *pvData;
    775775    /** Size (in bytes) of current data chunk. */
    776     uint32_t                    cbData;
     776    uint32_t cbData;
    777777    /** Checksum for current file data chunk. */
    778     void                       *pvChecksum;
     778    void    *pvChecksum;
    779779    /** Size (in bytes) of current data chunk. */
    780     uint32_t                    cbChecksum;
     780    uint32_t cbChecksum;
    781781} SHCLFILEDATA, *PSHCLFILEDATA;
    782782
    783783typedef struct _SHCLERRORDATA
    784784{
    785     int32_t                     rc;
     785    int32_t rc;
    786786} SHCLERRORDATA, *PSHCLERRORDATA;
    787787

  • trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxClipboard.cpp

    r80866 r80886  
    801801                                   if (RT_SUCCESS(rc))
    802802                                   {
    803                                        rc = SharedClipboardTransferLTransferSetRoots(pTransfer,
    804                                                                                      papszList, cbList + 1 /* Include termination */);
     803                                       rc = SharedClipboardTransferSetRoots(pTransfer,
     804                                                                            papszList, cbList + 1 /* Include termination */);
    805805                                       if (RT_SUCCESS(rc))
    806806                                       {
    … …  
    910910                               if (RT_SUCCESS(rc))
    911911                               {
    912                                    rc = SharedClipboardTransferLTransferSetRoots(pTransfer,
    913                                                                                  papszList, cbList + 1 /* Include termination */);
     912                                   rc = SharedClipboardTransferSetRoots(pTransfer,
     913                                                                        papszList, cbList + 1 /* Include termination */);
    914914                                   if (RT_SUCCESS(rc))
    915915                                   {

  • trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp

    r80867 r80886  
    14211421                PSHCLTRANSFER pTransfer = SharedClipboardTransferCtxGetTransfer(pTransferCtx,
    14221422                                                                                VBOX_SHCL_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID));
    1423                 AssertPtrBreakStmt(pTransfer, VERR_NOT_FOUND);
     1423                AssertPtrBreakStmt(pTransfer, rc = VERR_NOT_FOUND);
    14241424
    14251425                SHCLROOTLISTHDR rootListHdr;
    14261426                RT_ZERO(rootListHdr);
    14271427
    1428                 rootListHdr.cRoots = SharedClipboardTransferLTransferRootsCount(pTransfer);
     1428                rootListHdr.cRoots = SharedClipboardTransferRootsCount(pTransfer);
    14291429
    14301430                LogFlowFunc(("cRoots=%RU32\n", rootListHdr.cRoots));
    … …  
    14441444                PSHCLTRANSFER pTransfer = SharedClipboardTransferCtxGetTransfer(pTransferCtx,
    14451445                                                                                VBOX_SHCL_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID));
    1446                 AssertPtrBreakStmt(pTransfer, VERR_NOT_FOUND);
     1446                AssertPtrBreakStmt(pTransfer, rc = VERR_NOT_FOUND);
    14471447
    14481448                SHCLROOTLISTENTRY rootListEntry;
    1449                 rc = SharedClipboardTransferLTransferRootsEntry(pTransfer, uIndex, &rootListEntry);
     1449                rc = SharedClipboardTransferRootsEntry(pTransfer, uIndex, &rootListEntry);
    14501450                if (RT_SUCCESS(rc))
    14511451                    rc = VbglR3ClipboardRootListEntryReadReply(pCmdCtx, uIndex, &rootListEntry);
    … …  
    14651465                    PSHCLTRANSFER pTransfer = SharedClipboardTransferCtxGetTransfer(pTransferCtx,
    14661466                                                                                    VBOX_SHCL_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID));
    1467                     AssertPtrBreakStmt(pTransfer, VERR_NOT_FOUND);
     1467                    AssertPtrBreakStmt(pTransfer, rc = VERR_NOT_FOUND);
    14681468
    14691469                    LogFlowFunc(("pszPath=%s\n", openParmsList.pszPath));
    … …  
    14911491                PSHCLTRANSFER pTransfer = SharedClipboardTransferCtxGetTransfer(pTransferCtx,
    14921492                                                                                VBOX_SHCL_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID));
    1493                 AssertPtrBreakStmt(pTransfer, VERR_NOT_FOUND);
     1493                AssertPtrBreakStmt(pTransfer, rc = VERR_NOT_FOUND);
    14941494
    14951495                rc = SharedClipboardTransferListClose(pTransfer, hList);
    … …  
    15141514                PSHCLTRANSFER pTransfer = SharedClipboardTransferCtxGetTransfer(pTransferCtx,
    15151515                                                                                VBOX_SHCL_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID));
    1516                 AssertPtrBreakStmt(pTransfer, VERR_NOT_FOUND);
     1516                AssertPtrBreakStmt(pTransfer, rc = VERR_NOT_FOUND);
    15171517
    15181518                SHCLLISTHDR hdrList;
    … …  
    15591559                    PSHCLTRANSFER pTransfer = SharedClipboardTransferCtxGetTransfer(pTransferCtx,
    15601560                                                                                    VBOX_SHCL_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID));
    1561                     AssertPtrBreakStmt(pTransfer, VERR_NOT_FOUND);
     1561                    AssertPtrBreakStmt(pTransfer, rc = VERR_NOT_FOUND);
    15621562
    15631563                    rc = SharedClipboardTransferListRead(pTransfer, hList, &entryList);
    … …  
    16011601                    PSHCLTRANSFER pTransfer = SharedClipboardTransferCtxGetTransfer(pTransferCtx,
    16021602                                                                                    VBOX_SHCL_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID));
    1603                     AssertPtrBreakStmt(pTransfer, VERR_NOT_FOUND);
     1603                    AssertPtrBreakStmt(pTransfer, rc = VERR_NOT_FOUND);
    16041604
    16051605                    SHCLOBJHANDLE hObj;
    … …  
    16251625                PSHCLTRANSFER pTransfer = SharedClipboardTransferCtxGetTransfer(pTransferCtx,
    16261626                                                                                VBOX_SHCL_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID));
    1627                 AssertPtrBreakStmt(pTransfer, VERR_NOT_FOUND);
     1627                AssertPtrBreakStmt(pTransfer, rc = VERR_NOT_FOUND);
    16281628
    16291629                rc = SharedClipboardTransferObjectClose(pTransfer, hObj);
    … …  
    16471647                PSHCLTRANSFER pTransfer = SharedClipboardTransferCtxGetTransfer(pTransferCtx,
    16481648                                                                                VBOX_SHCL_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID));
    1649                 AssertPtrBreakStmt(pTransfer, VERR_NOT_FOUND);
     1649                AssertPtrBreakStmt(pTransfer, rc = VERR_NOT_FOUND);
    16501650
    16511651                AssertBreakStmt(pCmdCtx->cbChunkSize, rc = VERR_INVALID_PARAMETER);

  • trunk/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp

    r80862 r80886  
    19321932 * @param   pTransfer           Transfer to clear transfer root list for.
    19331933 */
    1934 static void sharedClipboardTransferListTransferRootsClear(PSHCLTRANSFER pTransfer)
     1934static void sharedClipboardTransferListRootsClear(PSHCLTRANSFER pTransfer)
    19351935{
    19361936    AssertPtrReturnVoid(pTransfer);
    … …  
    19651965 * @param   cbRoots             Size (in bytes) of string list.
    19661966 */
    1967 int SharedClipboardTransferLTransferSetRoots(PSHCLTRANSFER pTransfer, const char *pszRoots, size_t cbRoots)
     1967int SharedClipboardTransferSetRoots(PSHCLTRANSFER pTransfer, const char *pszRoots, size_t cbRoots)
    19681968{
    19691969    AssertPtrReturn(pTransfer,      VERR_INVALID_POINTER);
    … …  
    19761976    int rc = VINF_SUCCESS;
    19771977
    1978     sharedClipboardTransferListTransferRootsClear(pTransfer);
     1978    sharedClipboardTransferListRootsClear(pTransfer);
    19791979
    19801980    char  *pszPathRootAbs = NULL;
    … …  
    20392039    LogFlowFuncEnter();
    20402040
    2041     sharedClipboardTransferListTransferRootsClear(pTransfer);
     2041    sharedClipboardTransferListRootsClear(pTransfer);
    20422042}
    20432043
    … …  
    20612061 * @param   pTransfer           Clipboard transfer to return root entry count for.
    20622062 */
    2063 uint32_t SharedClipboardTransferLTransferRootsCount(PSHCLTRANSFER pTransfer)
     2063uint32_t SharedClipboardTransferRootsCount(PSHCLTRANSFER pTransfer)
    20642064{
    20652065    AssertPtrReturn(pTransfer, 0);
    … …  
    20752075 * @param   uIdx                Index of root list entry to return.
    20762076 */
    2077 inline PSHCLLISTROOT sharedClipboardTransferLTransferRootsGet(PSHCLTRANSFER pTransfer, uint32_t uIdx)
     2077inline PSHCLLISTROOT sharedClipboardTransferRootsGet(PSHCLTRANSFER pTransfer, uint32_t uIdx)
    20782078{
    20792079    if (uIdx >= pTransfer->cRoots)
    … …  
    20952095 * @param   pEntry              Where to store the returned entry on success.
    20962096 */
    2097 int SharedClipboardTransferLTransferRootsEntry(PSHCLTRANSFER pTransfer,
     2097int SharedClipboardTransferRootsEntry(PSHCLTRANSFER pTransfer,
    20982098                                               uint64_t uIndex, PSHCLROOTLISTENTRY pEntry)
    20992099{
    … …  
    21062106    int rc;
    21072107
    2108     PSHCLLISTROOT pRoot = sharedClipboardTransferLTransferRootsGet(pTransfer, uIndex);
     2108    PSHCLLISTROOT pRoot = sharedClipboardTransferRootsGet(pTransfer, uIndex);
    21092109    AssertPtrReturn(pRoot, VERR_INVALID_PARAMETER);
    21102110
    … …  
    21592159 * @param   ppRootList          Where to store the root list on success.
    21602160 */
    2161 int SharedClipboardTransferLTransferRootsAsList(PSHCLTRANSFER pTransfer, PSHCLROOTLIST *ppRootList)
     2161int SharedClipboardTransferRootsAsList(PSHCLTRANSFER pTransfer, PSHCLROOTLIST *ppRootList)
    21622162{
    21632163    AssertPtrReturn(pTransfer,  VERR_INVALID_POINTER);
    … …  
    21862186                for (uint64_t i = 0; i < cRoots; ++i)
    21872187                {
    2188                     rc = SharedClipboardTransferLTransferRootsEntry(pTransfer, i, &paRootListEntries[i]);
     2188                    rc = SharedClipboardTransferRootsEntry(pTransfer, i, &paRootListEntries[i]);
    21892189                    if (RT_FAILURE(rc))
    21902190                        break;
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