Changeset 87566 in vbox for trunk/src/VBox/GuestHost/SharedClipboard
- Timestamp:
- Feb 3, 2021 1:48:48 PM (4 years ago)
- svn:sync-xref-src-repo-rev:
- 142593
- Location:
- trunk/src/VBox/GuestHost/SharedClipboard
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/GuestHost/SharedClipboard/clipboard-x11.cpp
r87452 r87566 1426 1426 pv = RTMemDup(pCtx->pvUnicodeCache, pCtx->cbUnicodeCache); 1427 1427 if (pv) 1428 {1429 1428 cb = pCtx->cbUnicodeCache; 1430 }1431 1429 else 1432 1430 rc = VERR_NO_MEMORY; … … 1434 1432 } 1435 1433 else 1436 {1437 1434 rc = ShClX11RequestDataForX11Callback(pCtx->pFrontend, uFmt, &pv, &cb); 1438 }1439 1435 1440 1436 … … 1443 1439 if ( RT_SUCCESS(rc) 1444 1440 && (pv == NULL || cb == 0)) 1445 {1446 1441 rc = VERR_NO_DATA; 1447 }1448 1442 1449 1443 if (RT_SUCCESS(rc)) -
trunk/src/VBox/GuestHost/SharedClipboard/testcase/tstClipboardGH-X11.cpp
r87452 r87566 119 119 } 120 120 121 /** @copydoc ShClX11RequestDataForX11Callback */122 121 DECLCALLBACK(int) ShClX11RequestDataForX11Callback(PSHCLCONTEXT pCtx, uint32_t uFmt, void **ppv, uint32_t *pcb) 123 122 { … … 244 243 static uint32_t g_tst_uX11Formats = 0; 245 244 246 /** @copydoc ShClX11ReportFormatsCallback */247 245 DECLCALLBACK(void) ShClX11ReportFormatsCallback(PSHCLCONTEXT pCtx, SHCLFORMATS fFormats) 248 246 { … … 400 398 static char g_tst_abCompletedBuf[TESTCASE_MAX_BUF_SIZE]; 401 399 402 /** @copydoc ShClX11RequestFromX11CompleteCallback */ 403 void ShClX11RequestFromX11CompleteCallback(PSHCLCONTEXT pCtx, int rc,CLIPREADCBREQ *pReq, void *pv, uint32_t cb)400 DECLCALLBACK(void) ShClX11RequestFromX11CompleteCallback(PSHCLCONTEXT pCtx, int rcCompletion, 401 CLIPREADCBREQ *pReq, void *pv, uint32_t cb) 404 402 { 405 403 RT_NOREF(pCtx); 406 404 if (cb <= TESTCASE_MAX_BUF_SIZE) 407 405 { 408 g_tst_rcCompleted = rc ;406 g_tst_rcCompleted = rcCompletion; 409 407 if (cb != 0) 410 408 memcpy(g_tst_abCompletedBuf, pv, cb); -
trunk/src/VBox/GuestHost/SharedClipboard/testcase/tstClipboardGH-X11Smoke.cpp
r87452 r87566 30 30 #include <VBox/GuestHost/clipboard-helper.h> 31 31 32 /** @copydoc ShClX11RequestDataForX11Callback */ 32 33 33 DECLCALLBACK(int) ShClX11RequestDataForX11Callback(PSHCLCONTEXT pCtx, SHCLFORMAT uFmt, void **ppv, uint32_t *pcb) 34 34 { … … 37 37 } 38 38 39 /** @copydoc ShClX11ReportFormatsCallback */40 39 DECLCALLBACK(void) ShClX11ReportFormatsCallback(PSHCLCONTEXT pCtx, SHCLFORMATS fFormats) 41 40 { … … 43 42 } 44 43 45 /** @copydoc ShClX11RequestFromX11CompleteCallback */ 46 DECLCALLBACK(void) ShClX11RequestFromX11CompleteCallback(PSHCLCONTEXT pCtx, int rc,CLIPREADCBREQ *pReq, void *pv, uint32_t cb)44 DECLCALLBACK(void) ShClX11RequestFromX11CompleteCallback(PSHCLCONTEXT pCtx, int rcCompletion, 45 CLIPREADCBREQ *pReq, void *pv, uint32_t cb) 47 46 { 48 47 RT_NOREF(pCtx, rc, pReq, pv, cb);
Note:
See TracChangeset
for help on using the changeset viewer.