Changeset 80318 in vbox for trunk/include/VBox

Timestamp:

Aug 16, 2019 9:13:49 AM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/URI: More work on context IDs and entry list handling.

Location:

trunk/include/VBox

Files:

• GuestHost/SharedClipboard-win.h (modified) (2 diffs)
• HostServices/VBoxClipboardSvc.h (modified) (13 diffs)

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

@@ -218 +218 @@
     static int Thread(RTTHREAD hThread, void *pvUser);
 
+    int readDir(PSHAREDCLIPBOARDURITRANSFER pTransfer, const Utf8Str &strPath);
+
     int copyToHGlobal(const void *pvData, size_t cbData, UINT fFlags, HGLOBAL *phGlobal);
     int createFileGroupDescriptorFromTransfer(PSHAREDCLIPBOARDURITRANSFER pTransfer,
@@ -249 +251 @@
     IStream                    *m_pStream;
     ULONG                       m_uObjIdx;
-    /** List of (cached) file system root objects. */
-    FsObjEntryList              m_lstRootEntries;
+    /** List of (cached) file system objects. */
+    FsObjEntryList              m_lstEntries;
     /** Event being triggered when reading the transfer list been completed. */
     RTSEMEVENT                  m_EventListComplete;

trunk/include/VBox/HostServices/VBoxClipboardSvc.h

@@ -198 +198 @@
     RT_LO_U16(uContextID)
 
+/**
+ * Structure for keeping a Shared Clipboard HGCM message context.
+ */
+typedef struct _VBOXSHCLMSGCTX
+{
+    /** Context ID. */
+    uint32_t uContextID;
+} VBOXSHCLMSGCTX, *PVBOXSHCLMSGCTX;
+
 /*
  * HGCM parameter structures.
@@ -261 +270 @@
     VBGLIOCHGCMCALL hdr;
 
-    /** uint32_t, out: Context ID. Unused at the moment. */
+    /** uint32_t, out: Context ID. */
     HGCMFunctionParameter uContext;
     /** uint32_t, out: Status to report. */
@@ -310 +319 @@
     VBGLIOCHGCMCALL hdr;
 
-    /** uint32_t, in: Context ID. Unused at the moment. */
+    /** uint32_t, in: Context ID. */
     HGCMFunctionParameter uContext;
     /** uint32_t, in: Transfer status of type SHAREDCLIPBOARDURITRANSFERSTATUS. */
@@ -335 +344 @@
     VBGLIOCHGCMCALL hdr;
 
-    /** uint32_t, out: Context ID. Unused at the moment. */
+    /** uint32_t, out: Context ID. */
     HGCMFunctionParameter uContext;
     /** uint32_t, out: Message type of type VBOX_SHAREDCLIPBOARD_REPLYMSGTYPE_XXX. */
@@ -452 +461 @@
     VBGLIOCHGCMCALL hdr;
 
-    /** uint32_t, in: Context ID. Unused at the moment. */
+    /** uint32_t, in: Context ID. */
     HGCMFunctionParameter uContext;
     /** uint32_t, in: Listing flags (see VBOX_SHAREDCLIPBOARD_LIST_FLAG_XXX). */
@@ -477 +486 @@
     VBGLIOCHGCMCALL hdr;
 
-    /** uint32_t, in/out: Context ID. Unused at the moment. */
+    /** uint32_t, in/out: Context ID. */
     HGCMFunctionParameter uContext;
     /** uint64_t, in: List handle. */
@@ -487 +496 @@
 typedef struct _VBoxClipboardListHdrReqParms
 {
-    /** uint32_t, in: Context ID. Unused at the moment. */
+    /** uint32_t, in: Context ID. */
     HGCMFunctionParameter uContext;
     /** uint64_t, in: List handle. */
@@ -531 +540 @@
 typedef struct _VBoxClipboardListEntryReqParms
 {
-    /** uint32_t, in: Context ID. Unused at the moment. */
+    /** uint32_t, in: Context ID. */
     HGCMFunctionParameter uContext;
     /** uint64_t, in: List handle. */
@@ -575 +584 @@
     VBGLIOCHGCMCALL hdr;
 
-    /** uint32_t, in/out: Context ID. Unused at the moment. */
+    /** uint32_t, in/out: Context ID. */
     HGCMFunctionParameter uContext;
     /** uint64_t, in/out: Object handle. */
@@ -595 +604 @@
     VBGLIOCHGCMCALL hdr;
 
-    /** uint32_t, in/out: Context ID. Unused at the moment. */
+    /** uint32_t, in/out: Context ID. */
     HGCMFunctionParameter uContext;
     /** uint64_t, in: SHAREDCLIPBOARDOBJHANDLE of object to close. */
@@ -605 +614 @@
 typedef struct _VBoxClipboardObjReadReqParms
 {
-    /** uint32_t, in: Context ID. Unused at the moment. */
+    /** uint32_t, in: Context ID. */
     HGCMFunctionParameter uContext;
     /** uint64_t, in: SHAREDCLIPBOARDOBJHANDLE of object to write to. */
@@ -635 +644 @@
     VBGLIOCHGCMCALL hdr;
 
-    /** uint32_t, in/out: Context ID. Unused at the moment. */
+    /** uint32_t, in/out: Context ID. */
     HGCMFunctionParameter uContext;
     /** uint64_t, in/out: SHAREDCLIPBOARDOBJHANDLE of object to write to. */
@@ -663 +672 @@
     VBGLIOCHGCMCALL hdr;
 
-    /** uint32_t, in: Context ID. Unused at the moment. */
+    /** uint32_t, in: Context ID. */
     HGCMFunctionParameter uContext;
     /** uint32_t, in: The error code (IPRT-style). */