Changeset 101883 in vbox
- Timestamp:
- Nov 6, 2023 5:37:54 PM (15 months ago)
- Location:
- trunk/src/VBox/Additions/x11/VBoxClient
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/x11/VBoxClient/wayland-helper-dcp.cpp
r101878 r101883 352 352 * @returns IPRT status code. 353 353 * @param fd A file descriptor to write data to. 354 * @param p pvBufData buffer.355 * @param pcbBufSize of data buffer.354 * @param pvBuf Data buffer. 355 * @param cbBuf Size of data buffer. 356 356 */ 357 357 RTDECL(int) vbcl_wayland_hlp_dcp_write_wl_fd(int fd, void *pvBuf, size_t cbBuf) … … 455 455 * Release session resources. 456 456 * 457 * @returns IPRT status code.458 457 * @param pSession Session data. 459 458 */ … … 482 481 * Initialize session. 483 482 * 484 * @returns IPRT status code.485 483 * @param pSession Session data. 486 484 */ … … 498 496 * Reset previously initialized session. 499 497 * 500 * @returns IPRT status code.501 498 * @param pSession Session data. 502 499 */ … … 505 502 vbcl_wayland_hlp_dcp_session_release(pSession); 506 503 vbcl_wayland_hlp_dcp_session_init(pSession); 507 #if 0508 void *pvData;509 510 if (!RTListIsEmpty(&pSession->clip.mimeTypesList.Node))511 {512 vbox_wl_dcp_mime_t *pEntry, *pNextEntry;513 514 RTListForEachSafe(&pSession->clip.mimeTypesList.Node, pEntry, pNextEntry, vbox_wl_dcp_mime_t, Node)515 {516 RTListNodeRemove(&pEntry->Node);517 RTStrFree(pEntry->pszMimeType);518 RTMemFree(pEntry);519 }520 }521 522 pvData = (void *)pSession->clip.pvClipboardBuf.reset();523 if (RT_VALID_PTR(pvData))524 RTMemFree(pvData);525 526 527 RTListInit(&pSession->clip.mimeTypesList.Node);528 529 pSession->clip.fFmts.init(VBOX_SHCL_FMT_NONE, VBCL_WAYLAND_VALUE_WAIT_TIMEOUT_MS);530 pSession->clip.uFmt.init(VBOX_SHCL_FMT_NONE, VBCL_WAYLAND_VALUE_WAIT_TIMEOUT_MS);531 pSession->clip.pvClipboardBuf.init(0, VBCL_WAYLAND_DATA_WAIT_TIMEOUT_MS);532 pSession->clip.cbClipboardBuf.init(0, VBCL_WAYLAND_DATA_WAIT_TIMEOUT_MS);533 #endif534 504 } 535 505 … … 771 741 * @param pCtx DCP context data. 772 742 * @param pOffer Data offer object. 743 * @param uFmt Clipboard format in VBox representation. 773 744 * @param pszMimeType Requested mime-type in string representation. 774 745 */ … … 976 947 */ 977 948 static void vbcl_wayland_hlp_dcp_data_device_finished( 978 void * data, struct zwlr_data_control_device_v1 *pDevice)979 { 980 RT_NOREF( data);949 void *pvUser, struct zwlr_data_control_device_v1 *pDevice) 950 { 951 RT_NOREF(pvUser); 981 952 982 953 VBCL_LOG_CALLBACK; … … 1025 996 * 1026 997 * @param pvUser VBox private data. 1027 * @param p SourceSourceWayland Data Control Source object.998 * @param pDataSource, Wayland Data Control Source object. 1028 999 * @param sMimeType A mime-type of requested data. 1029 1000 * @param fd A file descriptor to write clipboard content into. -
trunk/src/VBox/Additions/x11/VBoxClient/wayland-helper-gtk.cpp
r101878 r101883 66 66 /** 67 67 * A set of objects required to handle clipboard sharing over 68 * and drag-n-drop using Gtk library. .*/68 * and drag-n-drop using Gtk library. */ 69 69 typedef struct 70 70 { -
trunk/src/VBox/Additions/x11/VBoxClient/wayland-helper-ipc.h
r101881 r101883 294 294 * 295 295 * @returns IPRT status code. 296 * @param uSessionId IPC session ID.297 * @param uSessionIdIPC connection handle.296 * @param uSessionId IPC session ID. 297 * @param hIpcSession IPC connection handle. 298 298 */ 299 299 int send_formats(uint32_t uSessionId, RTLOCALIPCSESSION hIpcSession); … … 303 303 * 304 304 * @returns IPRT status code. 305 * @param uSessionId IPC session ID.306 * @param uSessionIdIPC connection handle.305 * @param uSessionId IPC session ID. 306 * @param hIpcSession IPC connection handle. 307 307 */ 308 308 int recv_formats(uint32_t uSessionId, RTLOCALIPCSESSION hIpcSession); … … 312 312 * 313 313 * @returns IPRT status code. 314 * @param uSessionId IPC session ID.315 * @param uSessionIdIPC connection handle.314 * @param uSessionId IPC session ID. 315 * @param hIpcSession IPC connection handle. 316 316 */ 317 317 int send_format(uint32_t uSessionId, RTLOCALIPCSESSION hIpcSession); 318 318 319 320 319 /** 321 320 * Receive requested clipboard format over IPC. 322 321 * 323 322 * @returns IPRT status code. 324 * @param uSessionId IPC session ID.325 * @param uSessionIdIPC connection handle.323 * @param uSessionId IPC session ID. 324 * @param hIpcSession IPC connection handle. 326 325 */ 327 326 int recv_format(uint32_t uSessionId, RTLOCALIPCSESSION hIpcSession); … … 331 330 * 332 331 * @returns IPRT status code. 333 * @param uSessionId IPC session ID.334 * @param uSessionIdIPC connection handle.332 * @param uSessionId IPC session ID. 333 * @param hIpcSession IPC connection handle. 335 334 */ 336 335 int send_data(uint32_t uSessionId, RTLOCALIPCSESSION hIpcSession); … … 340 339 * 341 340 * @returns IPRT status code. 342 * @param uSessionId IPC session ID.343 * @param uSessionIdIPC connection handle.341 * @param uSessionId IPC session ID. 342 * @param hIpcSession IPC connection handle. 344 343 */ 345 344 int recv_data(uint32_t uSessionId, RTLOCALIPCSESSION hIpcSession); … … 414 413 * This function should be used by both IPC server and client code 415 414 * in order to connect one to another. Output string will be in 416 * format: GtkHlpIpcServer- <active tty>-<user name>.415 * format: GtkHlpIpcServer-<active tty>-<user name>. 417 416 * 418 417 * @returns IPRT status code.
Note:
See TracChangeset
for help on using the changeset viewer.