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

Timestamp:

May 18, 2019 3:48:41 PM (6 years ago)

Author:

vboxsync

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

130636

Message:

Shared Clipboard/URI: Update.

Location:

trunk/include/VBox/GuestHost

Files:

• SharedClipboard-uri.h (modified) (1 diff)
• SharedClipboard-win.h (modified) (4 diffs)
• SharedClipboard.h (modified) (2 diffs)

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

@@ -89 +89 @@
 
     /** Number of references to this instance. */
-    volatile uint16_t            m_cRefs;
+    volatile uint32_t            m_cRefs;
     /** Critical section for serializing access. */
     RTCRITSECT                   m_CritSect;

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

@@ -70 +70 @@
  * If the new API is not available, those function pointer are NULL.
  */
-typedef struct VBOXCLIPBOARDWINAPINEW
+typedef struct _VBOXCLIPBOARDWINAPINEW
 {
     PFNADDCLIPBOARDFORMATLISTENER    pfnAddClipboardFormatListener;
@@ -79 +79 @@
  * Structure for keeping variables which are needed to drive the old clipboard API.
  */
-typedef struct VBOXCLIPBOARDWINAPIOLD
+typedef struct _VBOXCLIPBOARDWINAPIOLD
 {
     /** Timer ID for the refresh timer. */
@@ -91 +91 @@
 
 /**
+ * Structure for maintaining a single URI list transfer.
+ */
+typedef struct _VBOXCLIPBOARDWINURITRANSFER
+{
+    /** Pointer to data object to use for this transfer. */
+    VBoxClipboardWinDataObject *pDataObj;
+} VBOXCLIPBOARDWINURITRANSFER, *PVBOXCLIPBOARDWINURITRANSFER;
+
+/**
  * Structure for keeping URI clipboard information around.
  */
 typedef struct _VBOXCLIPBOARDWINURI
 {
-    UINT cfFileGroupDescriptor;
-    UINT cfFileContents;
-    VBoxClipboardWinDataObject *pDataObj;
+    /** Transfer data; at the moment we only support one transfer at a time.
+     *  Use a list or something lateron. */
+    VBOXCLIPBOARDWINURITRANSFER Transfer;
+    /** Number of concurrent transfers.
+     *  At the moment we only support only one transfer at a time. */
+    uint32_t                    cTransfers;
 } VBOXCLIPBOARDWINURI, *PVBOXCLIPBOARDWINURI;
 #endif
 
-typedef struct VBOXCLIPBOARDWINCTX
+/**
+ * Structure for maintaining a Shared Clipboard context on Windows platforms.
+ */
+typedef struct _VBOXCLIPBOARDWINCTX
 {
     /** Window handle of our (invisible) clipbaord window. */
@@ -130 +145 @@
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
-int VBoxClipboardWinDropFilesToStringList(DROPFILES *pDropFiles, void **ppvData, size_t *pcbData);
+int VBoxClipboardWinDropFilesToStringList(DROPFILES *pDropFiles, char **ppszData, size_t *pcbData);
 #endif
 

trunk/include/VBox/GuestHost/SharedClipboard.h

@@ -99 +99 @@
 #endif
 extern int ClipStopX11(CLIPBACKEND *pBackend);
-extern void ClipAnnounceFormatToX11(CLIPBACKEND *pBackend,
-                                    uint32_t u32Formats);
-extern int ClipRequestDataFromX11(CLIPBACKEND *pBackend, uint32_t u32Format,
+extern int ClipAnnounceFormatToX11(CLIPBACKEND *pBackend,
+                                   VBOXCLIPBOARDFORMATS vboxFormats);
+extern int ClipRequestDataFromX11(CLIPBACKEND *pBackend, VBOXCLIPBOARDFORMATS vboxFormat,
                                   CLIPREADCBREQ *pReq);
 
@@ -114 +114 @@
                                            uint32_t cb);
 #endif /* !VBOX_INCLUDED_GuestHost_SharedClipboard_h */
-