Changeset 79107 in vbox for trunk/include/VBox/GuestHost

Timestamp:

Jun 12, 2019 1:57:04 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

131269

Message:

Shared Clipboard/URI: Update.

Location:

trunk/include/VBox/GuestHost

Files:

• SharedClipboard-uri.h (modified) (5 diffs)
• SharedClipboard.h (modified) (1 diff)

trunk/include/VBox/GuestHost/SharedClipboard-uri.h

@@ -638 +638 @@
 
 /**
+ * Structure for handling a single URI object context.
+ */
+typedef struct _SHAREDCLIPBOARDCLIENTURIOBJCTX
+{
+    /** Pointer to current object being processed. */
+    SharedClipboardURIObject      *pObj;
+} SHAREDCLIPBOARDCLIENTURIOBJCTX, *PSHAREDCLIPBOARDCLIENTURIOBJCTX;
+
+/**
  * Structure for maintaining a single URI transfer.
  *
@@ -654 +663 @@
     /** The transfer's meta data cache. */
     SHAREDCLIPBOARDMETADATA             Meta;
+    /** The transfer's own (local) area, if any (can be NULL if not needed).
+     *  The area itself has a clipboard area ID assigned.
+     *  On the host this area ID gets shared (maintained / locked) across all VMs via VBoxSVC. */
+    SharedClipboardArea                *pArea;
     /** The URI list for this transfer. */
     SharedClipboardURIList              URIList;
+    /** Context of current object being handled. */
+    SHAREDCLIPBOARDCLIENTURIOBJCTX      ObjCtx;
     /** The Shared Clipboard provider in charge for this transfer. */
     SharedClipboardProvider            *pProvider;
@@ -681 +696 @@
      *  At the moment we only support only one transfer at a time. */
     uint32_t                    cTransfers;
+    /** Maximum Number of concurrent transfers.
+     *  At the moment we only support one transfer at a time (per client). */
+    uint32_t                    cMaxTransfers;
 } SHAREDCLIPBOARDURICTX, *PSHAREDCLIPBOARDURICTX;
+
+int SharedClipboardURIObjCtxInit(PSHAREDCLIPBOARDCLIENTURIOBJCTX pObjCtx);
+void SharedClipboardURIObjCtxUninit(PSHAREDCLIPBOARDCLIENTURIOBJCTX pObjCtx);
+SharedClipboardURIObject *SharedClipboardURIObjCtxGetObj(PSHAREDCLIPBOARDCLIENTURIOBJCTX pObjCtx);
+bool SharedClipboardURIObjCtxIsValid(PSHAREDCLIPBOARDCLIENTURIOBJCTX pObjCtx);
 
 int SharedClipboardURITransferCreate(SHAREDCLIPBOARDURITRANSFERDIR enmDir, PSHAREDCLIPBOARDPROVIDERCREATIONCTX pCtx,
@@ -687 +710 @@
 int SharedClipboardURITransferDestroy(PSHAREDCLIPBOARDURITRANSFER pTransfer);
 void SharedClipboardURITransferReset(PSHAREDCLIPBOARDURITRANSFER pTransfer);
+SharedClipboardArea *SharedClipboardURITransferGetArea(PSHAREDCLIPBOARDURITRANSFER pTransfer);
 const SharedClipboardURIObject *SharedClipboardURITransferGetCurrentObject(PSHAREDCLIPBOARDURITRANSFER pTransfer);
 SharedClipboardProvider *SharedClipboardURITransferGetProvider(PSHAREDCLIPBOARDURITRANSFER pTransfer);
-const SharedClipboardURIList *SharedClipboardURITransferGetList(PSHAREDCLIPBOARDURITRANSFER pTransfer);
-const SharedClipboardURIObject *SharedClipboardURITransferGetObject(PSHAREDCLIPBOARDURITRANSFER pTransfer, uint64_t uIdx);
+SharedClipboardURIList *SharedClipboardURITransferGetList(PSHAREDCLIPBOARDURITRANSFER pTransfer);
+SharedClipboardURIObject *SharedClipboardURITransferGetObject(PSHAREDCLIPBOARDURITRANSFER pTransfer, uint64_t uIdx);
 int SharedClipboardURITransferRun(PSHAREDCLIPBOARDURITRANSFER pTransfer, bool fAsync);
 void SharedClipboardURITransferSetCallbacks(PSHAREDCLIPBOARDURITRANSFER pTransfer, PSHAREDCLIPBOARDURITRANSFERCALLBACKS pCallbacks);
@@ -709 +733 @@
 PSHAREDCLIPBOARDURITRANSFER SharedClipboardURICtxGetTransfer(PSHAREDCLIPBOARDURICTX pURI, uint32_t uIdx);
 uint32_t SharedClipboardURICtxGetActiveTransfers(PSHAREDCLIPBOARDURICTX pURI);
+bool SharedClipboardURICtxMaximumTransfersReached(PSHAREDCLIPBOARDURICTX pURI);
 int SharedClipboardURICtxTransferAdd(PSHAREDCLIPBOARDURICTX pURI, PSHAREDCLIPBOARDURITRANSFER pTransfer);
 int SharedClipboardURICtxTransferRemove(PSHAREDCLIPBOARDURICTX pURI, PSHAREDCLIPBOARDURITRANSFER pTransfer);

trunk/include/VBox/GuestHost/SharedClipboard.h

@@ -62 +62 @@
  * The host messages for the guest.
  */
-#define VBOX_SHARED_CLIPBOARD_HOST_MSG_QUIT               1
-#define VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA          2
-#define VBOX_SHARED_CLIPBOARD_HOST_MSG_REPORT_FORMATS     3
+#define VBOX_SHARED_CLIPBOARD_HOST_MSG_QUIT                   1
+#define VBOX_SHARED_CLIPBOARD_HOST_MSG_READ_DATA              2
+#define VBOX_SHARED_CLIPBOARD_HOST_MSG_REPORT_FORMATS         3
+#ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
+#define VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_READ_DATA_HDR      4
+#define VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_WRITE_DATA_HDR     5
+#define VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_READ_DATA_CHUNK    6
+#define VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_WRITE_DATA_CHUNK   7
+#define VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_READ_DIR           8
+#define VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_WRITE_DIR          9
+#define VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_READ_FILE_HDR      10
+#define VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_WRITE_FILE_HDR     11
+#define VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_READ_FILE_DATA     12
+#define VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_WRITE_FILE_DATA    13
+#define VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_CANCEL             14
+#define VBOX_SHARED_CLIPBOARD_HOST_MSG_URI_ERROR              15
+#endif /* VBOX_WITH_SHARED_CLIPBOARD_URI_LIST */
 
 enum