Changeset 80848 in vbox for trunk/src/VBox
- Timestamp:
- Sep 17, 2019 9:43:53 AM (5 years ago)
- Location:
- trunk/src/VBox
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibClipboard.cpp
r80847 r80848 1353 1353 if (RT_SUCCESS(rc)) 1354 1354 { 1355 const SHCLURITRANSFERID uTransferID = VBO _SHARED_CLIPBOARD_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID);1355 const SHCLURITRANSFERID uTransferID = VBOX_SHCL_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID); 1356 1356 1357 1357 LogFlowFunc(("[Transfer %RU16] %s\n", uTransferID, VBoxShClTransferStatusToStr(transferReport.uStatus))); … … 1383 1383 { 1384 1384 rc = vbglR3ClipboardTransferStop(pCmdCtx, pTransferCtx, 1385 VBO _SHARED_CLIPBOARD_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID));1385 VBOX_SHCL_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID)); 1386 1386 break; 1387 1387 } … … 1396 1396 pEvent->u.TransferStatus.enmDir = enmDir; 1397 1397 pEvent->u.TransferStatus.Report = transferReport; 1398 pEvent->u.TransferStatus.uID = VBO _SHARED_CLIPBOARD_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID);1398 pEvent->u.TransferStatus.uID = VBOX_SHCL_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID); 1399 1399 1400 1400 pEvent->enmType = VBGLR3CLIPBOARDEVENTTYPE_URI_TRANSFER_STATUS; … … 1418 1418 { 1419 1419 PSHCLURITRANSFER pTransfer = SharedClipboardURICtxGetTransfer(pTransferCtx, 1420 VBO _SHARED_CLIPBOARD_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID));1420 VBOX_SHCL_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID)); 1421 1421 AssertPtrBreakStmt(pTransfer, VERR_NOT_FOUND); 1422 1422 … … 1441 1441 { 1442 1442 PSHCLURITRANSFER pTransfer = SharedClipboardURICtxGetTransfer(pTransferCtx, 1443 VBO _SHARED_CLIPBOARD_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID));1443 VBOX_SHCL_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID)); 1444 1444 AssertPtrBreakStmt(pTransfer, VERR_NOT_FOUND); 1445 1445 … … 1462 1462 { 1463 1463 PSHCLURITRANSFER pTransfer = SharedClipboardURICtxGetTransfer(pTransferCtx, 1464 VBO _SHARED_CLIPBOARD_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID));1464 VBOX_SHCL_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID)); 1465 1465 AssertPtrBreakStmt(pTransfer, VERR_NOT_FOUND); 1466 1466 … … 1488 1488 { 1489 1489 PSHCLURITRANSFER pTransfer = SharedClipboardURICtxGetTransfer(pTransferCtx, 1490 VBO _SHARED_CLIPBOARD_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID));1490 VBOX_SHCL_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID)); 1491 1491 AssertPtrBreakStmt(pTransfer, VERR_NOT_FOUND); 1492 1492 … … 1511 1511 { 1512 1512 PSHCLURITRANSFER pTransfer = SharedClipboardURICtxGetTransfer(pTransferCtx, 1513 VBO _SHARED_CLIPBOARD_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID));1513 VBOX_SHCL_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID)); 1514 1514 AssertPtrBreakStmt(pTransfer, VERR_NOT_FOUND); 1515 1515 … … 1556 1556 { 1557 1557 PSHCLURITRANSFER pTransfer = SharedClipboardURICtxGetTransfer(pTransferCtx, 1558 VBO _SHARED_CLIPBOARD_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID));1558 VBOX_SHCL_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID)); 1559 1559 AssertPtrBreakStmt(pTransfer, VERR_NOT_FOUND); 1560 1560 … … 1598 1598 { 1599 1599 PSHCLURITRANSFER pTransfer = SharedClipboardURICtxGetTransfer(pTransferCtx, 1600 VBO _SHARED_CLIPBOARD_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID));1600 VBOX_SHCL_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID)); 1601 1601 AssertPtrBreakStmt(pTransfer, VERR_NOT_FOUND); 1602 1602 … … 1622 1622 { 1623 1623 PSHCLURITRANSFER pTransfer = SharedClipboardURICtxGetTransfer(pTransferCtx, 1624 VBO _SHARED_CLIPBOARD_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID));1624 VBOX_SHCL_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID)); 1625 1625 AssertPtrBreakStmt(pTransfer, VERR_NOT_FOUND); 1626 1626 … … 1644 1644 { 1645 1645 PSHCLURITRANSFER pTransfer = SharedClipboardURICtxGetTransfer(pTransferCtx, 1646 VBO _SHARED_CLIPBOARD_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID));1646 VBOX_SHCL_CONTEXTID_GET_TRANSFER(pCmdCtx->uContextID)); 1647 1647 AssertPtrBreakStmt(pTransfer, VERR_NOT_FOUND); 1648 1648 -
trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-uri.cpp
r80847 r80848 1307 1307 break; 1308 1308 1309 const SHCLURITRANSFERID uTransferID = VBO _SHARED_CLIPBOARD_CONTEXTID_GET_TRANSFER(uCID);1309 const SHCLURITRANSFERID uTransferID = VBOX_SHCL_CONTEXTID_GET_TRANSFER(uCID); 1310 1310 1311 1311 pTransfer = SharedClipboardURICtxGetTransfer(&pClient->URI, uTransferID);
Note:
See TracChangeset
for help on using the changeset viewer.