Changeset 81325 in vbox for trunk/src/VBox/GuestHost
- Timestamp:
- Oct 17, 2019 4:07:37 PM (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/GuestHost/SharedClipboard/clipboard-transfers.cpp
r81324 r81325 254 254 * @param pListHdr transfer list header to duplicate. 255 255 */ 256 PSHCLLISTHDR Sh aredClipboardTransferListHdrDup(PSHCLLISTHDR pListHdr)256 PSHCLLISTHDR ShClTransferListHdrDup(PSHCLLISTHDR pListHdr) 257 257 { 258 258 AssertPtrReturn(pListHdr, NULL); … … 637 637 * @param pObjCtx transfer object context to check. 638 638 */ 639 bool Sh aredClipboardTransferObjCtxIsValid(PSHCLCLIENTTRANSFEROBJCTX pObjCtx)639 bool ShClTransferObjCtxIsValid(PSHCLCLIENTTRANSFEROBJCTX pObjCtx) 640 640 { 641 641 return ( pObjCtx … … 1343 1343 * @param hList List handle of the list to get handle info for. 1344 1344 */ 1345 inline PSHCLLISTHANDLEINFO sh aredClipboardTransferListGetByHandle(PSHCLTRANSFER pTransfer, SHCLLISTHANDLE hList)1345 inline PSHCLLISTHANDLEINFO shClTransferListGetByHandle(PSHCLTRANSFER pTransfer, SHCLLISTHANDLE hList) 1346 1346 { 1347 1347 PSHCLLISTHANDLEINFO pIt; … … 1361 1361 * @param pTransfer Clipboard transfer to create new list handle for. 1362 1362 */ 1363 inline SHCLLISTHANDLE sh aredClipboardTransferListHandleNew(PSHCLTRANSFER pTransfer)1363 inline SHCLLISTHANDLE shClTransferListHandleNew(PSHCLTRANSFER pTransfer) 1364 1364 { 1365 1365 return pTransfer->uListHandleNext++; /** @todo Good enough for now. Improve this later. */ … … 1481 1481 if (RT_SUCCESS(rc)) 1482 1482 { 1483 pInfo->hList = sh aredClipboardTransferListHandleNew(pTransfer);1483 pInfo->hList = shClTransferListHandleNew(pTransfer); 1484 1484 1485 1485 RTListAppend(&pTransfer->lstList, &pInfo->Node); … … 1551 1551 if (pTransfer->State.enmSource == SHCLSOURCE_LOCAL) 1552 1552 { 1553 PSHCLLISTHANDLEINFO pInfo = sh aredClipboardTransferListGetByHandle(pTransfer, hList);1553 PSHCLLISTHANDLEINFO pInfo = shClTransferListGetByHandle(pTransfer, hList); 1554 1554 if (pInfo) 1555 1555 { … … 1602 1602 * @param pszPath Path of file to add. 1603 1603 */ 1604 static int sh aredClipboardTransferListHdrAddFile(PSHCLLISTHDR pHdr, const char *pszPath)1604 static int shclTransferListHdrAddFile(PSHCLLISTHDR pHdr, const char *pszPath) 1605 1605 { 1606 1606 uint64_t cbSize = 0; … … 1626 1626 * @param cchDstBase Number of charaters of destination base path. 1627 1627 */ 1628 static int sh aredClipboardTransferListHdrFromDir(PSHCLLISTHDR pHdr, const char *pcszPathAbs)1628 static int shclTransferListHdrFromDir(PSHCLLISTHDR pHdr, const char *pcszPathAbs) 1629 1629 { 1630 1630 AssertPtrReturn(pcszPathAbs, VERR_INVALID_POINTER); … … 1671 1671 if (pszSrc) 1672 1672 { 1673 rc = sh aredClipboardTransferListHdrAddFile(pHdr, pszSrc);1673 rc = shclTransferListHdrAddFile(pHdr, pszSrc); 1674 1674 RTStrFree(pszSrc); 1675 1675 } … … 1695 1695 else if (RTFS_IS_FILE(objInfo.Attr.fMode)) 1696 1696 { 1697 rc = sh aredClipboardTransferListHdrAddFile(pHdr, pcszPathAbs);1697 rc = shclTransferListHdrAddFile(pHdr, pcszPathAbs); 1698 1698 } 1699 1699 else if (RTFS_IS_SYMLINK(objInfo.Attr.fMode)) … … 1729 1729 if (pTransfer->State.enmSource == SHCLSOURCE_LOCAL) 1730 1730 { 1731 PSHCLLISTHANDLEINFO pInfo = sh aredClipboardTransferListGetByHandle(pTransfer, hList);1731 PSHCLLISTHANDLEINFO pInfo = shClTransferListGetByHandle(pTransfer, hList); 1732 1732 if (pInfo) 1733 1733 { … … 1741 1741 LogFlowFunc(("DirAbs: %s\n", pInfo->pszPathLocalAbs)); 1742 1742 1743 rc = sh aredClipboardTransferListHdrFromDir(pHdr, pInfo->pszPathLocalAbs);1743 rc = shclTransferListHdrFromDir(pHdr, pInfo->pszPathLocalAbs); 1744 1744 break; 1745 1745 } … … 1829 1829 if (pTransfer->State.enmSource == SHCLSOURCE_LOCAL) 1830 1830 { 1831 PSHCLLISTHANDLEINFO pInfo = sh aredClipboardTransferListGetByHandle(pTransfer, hList);1831 PSHCLLISTHANDLEINFO pInfo = shClTransferListGetByHandle(pTransfer, hList); 1832 1832 if (pInfo) 1833 1833 { … … 1980 1980 if (pTransfer->State.enmSource == SHCLSOURCE_LOCAL) 1981 1981 { 1982 fIsValid = sh aredClipboardTransferListGetByHandle(pTransfer, hList) != NULL;1982 fIsValid = shClTransferListGetByHandle(pTransfer, hList) != NULL; 1983 1983 } 1984 1984 else if (pTransfer->State.enmSource == SHCLSOURCE_REMOTE) … … 2034 2034 * @param pTransfer Transfer to clear transfer root list for. 2035 2035 */ 2036 static void sh aredClipboardTransferListRootsClear(PSHCLTRANSFER pTransfer)2036 static void shClTransferListRootsClear(PSHCLTRANSFER pTransfer) 2037 2037 { 2038 2038 AssertPtrReturnVoid(pTransfer); … … 2069 2069 LogFlowFuncEnter(); 2070 2070 2071 sh aredClipboardTransferListRootsClear(pTransfer);2071 shClTransferListRootsClear(pTransfer); 2072 2072 } 2073 2073 … … 2105 2105 * @param uIdx Index of root list entry to return. 2106 2106 */ 2107 inline PSHCLLISTROOT sh aredClipboardTransferRootsGetInternal(PSHCLTRANSFER pTransfer, uint32_t uIdx)2107 inline PSHCLLISTROOT shClTransferRootsGetInternal(PSHCLTRANSFER pTransfer, uint32_t uIdx) 2108 2108 { 2109 2109 if (uIdx >= pTransfer->cRoots) … … 2136 2136 int rc; 2137 2137 2138 PSHCLLISTROOT pRoot = sh aredClipboardTransferRootsGetInternal(pTransfer, uIndex);2138 PSHCLLISTROOT pRoot = shClTransferRootsGetInternal(pTransfer, uIndex); 2139 2139 AssertPtrReturn(pRoot, VERR_INVALID_PARAMETER); 2140 2140 … … 2271 2271 int rc = VINF_SUCCESS; 2272 2272 2273 sh aredClipboardTransferListRootsClear(pTransfer);2273 shClTransferListRootsClear(pTransfer); 2274 2274 2275 2275 char *pszPathRootAbs = NULL;
Note:
See TracChangeset
for help on using the changeset viewer.