Changeset 79702 in vbox for trunk/include

Timestamp:

Jul 11, 2019 7:34:05 PM (6 years ago)

Author:

vboxsync

Message:

Shared Clipboard/URI: Update.

Location:

trunk/include/VBox

Files:

• GuestHost/SharedClipboard-uri.h (modified) (5 diffs)
• GuestHost/SharedClipboard-win.h (modified) (7 diffs)
• HostServices/VBoxClipboardSvc.h (modified) (3 diffs)

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

@@ -382 +382 @@
     /** Size (in bytes) of string list. */
     uint32_t cbRoots;
-    /** String list (separated with CRLF) containing the root items. */
+    /** String list (separated with \r\n) containing the root items. */
     char    *pszRoots;
 } VBOXCLIPBOARDROOTS, *PVBOXCLIPBOARDROOTS;
@@ -699 +699 @@
     SHAREDCLIPBOARDURITRANSFEREVENTTYPE_LIST_ENTRY_READ,
     SHAREDCLIPBOARDURITRANSFEREVENTTYPE_LIST_ENTRY_WRITE,
-    SHAREDCLIPBOARDURITRANSFEREVENTTYPE_FILE_OPEN,
-    SHAREDCLIPBOARDURITRANSFEREVENTTYPE_FILE_CLOSE,
-    SHAREDCLIPBOARDURITRANSFEREVENTTYPE_FILE_READ,
-    SHAREDCLIPBOARDURITRANSFEREVENTTYPE_FILE_WRITE,
+    SHAREDCLIPBOARDURITRANSFEREVENTTYPE_OBJ_OPEN,
+    SHAREDCLIPBOARDURITRANSFEREVENTTYPE_OBJ_CLOSE,
+    SHAREDCLIPBOARDURITRANSFEREVENTTYPE_OBJ_READ,
+    SHAREDCLIPBOARDURITRANSFEREVENTTYPE_OBJ_WRITE,
     SHAREDCLIPBOARDURITRANSFEREVENTTYPE_ERROR,
     /** Marks the end of the event list. */
@@ -814 +814 @@
 SHAREDCLIPBOARDPROVIDERFUNCDECL(OBJREAD, SHAREDCLIPBOARDOBJHANDLE hObj, void *pvData, uint32_t cbData, uint32_t fFlags, uint32_t *pcbRead)
 SHAREDCLIPBOARDPROVIDERFUNCDECL(OBJWRITE, SHAREDCLIPBOARDOBJHANDLE hObj, void *pvData, uint32_t cbData, uint32_t fFlags, uint32_t *pcbWritten)
-SHAREDCLIPBOARDPROVIDERFUNCDECLRET(uint64_t, OBJGETSIZE, SHAREDCLIPBOARDOBJHANDLE hObj)
-SHAREDCLIPBOARDPROVIDERFUNCDECLRET(uint64_t, OBJGETPROCESSED, SHAREDCLIPBOARDOBJHANDLE hObj)
-SHAREDCLIPBOARDPROVIDERFUNCDECLRET(const char *, OBJGETPATH, SHAREDCLIPBOARDOBJHANDLE hObj)
 
 /**
@@ -836 +833 @@
     SHAREDCLIPBOARDPROVIDERFUNCMEMBER(OBJREAD, pfnObjRead);
     SHAREDCLIPBOARDPROVIDERFUNCMEMBER(OBJWRITE, pfnObjWrite);
-    SHAREDCLIPBOARDPROVIDERFUNCMEMBER(OBJGETSIZE, pfnObjGetSize);
-    SHAREDCLIPBOARDPROVIDERFUNCMEMBER(OBJGETPROCESSED, pfnObjGetProcessed);
-    SHAREDCLIPBOARDPROVIDERFUNCMEMBER(OBJGETPATH, pfnObjGetPath);
 } SHAREDCLIPBOARDPROVIDERINTERFACE, *PSHAREDCLIPBOARDPROVIDERINTERFACE;
 
@@ -1056 +1050 @@
 
 #endif /* !VBOX_INCLUDED_GuestHost_SharedClipboard_uri_h */
+

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

@@ -36 +36 @@
 
 # ifdef VBOX_WITH_SHARED_CLIPBOARD_URI_LIST
+#  include <vector>
+
 #  include <iprt/cpp/ministring.h> /* For RTCString. */
-#  include <iprt/win/shlobj.h> /* For DROPFILES and friends. */
+#  include <iprt/win/shlobj.h>     /* For DROPFILES and friends. */
+#  include <VBox/com/string.h>     /* For Utf8Str. */
 #  include <oleidl.h>
 
 # include <VBox/GuestHost/SharedClipboard-uri.h>
-# endif
+
+using namespace com;
+# endif /* VBOX_WITH_SHARED_CLIPBOARD_URI_LIST */
 
 #ifndef WM_CLIPBOARDUPDATE
@@ -163 +168 @@
     };
 
-    enum FormatIndex
-    {
-        /** File descriptor, ANSI version. */
-        FormatIndex_FileDescriptorA = 0,
-        /** File descriptor, Unicode version. */
-        FormatIndex_FileDescriptorW,
-        /** File contents. */
-        FormatIndex_FileContents
-    };
-
 public:
 
@@ -232 +227 @@
 protected:
 
+    /**
+     * Structure for keeping a single file system object entry.
+     */
+    struct FSOBJENTRY
+    {
+        /** Relative path of the object. */
+        Utf8Str                  strPath;
+        /** Related (cached) object information. */
+        SHAREDCLIPBOARDFSOBJINFO objInfo;
+    };
+
+    /** Vector containing file system objects with its (cached) objection information. */
+    typedef std::vector<FSOBJENTRY> FsObjEntryList;
+
     Status                      m_enmStatus;
     LONG                        m_lRefCount;
@@ -240 +249 @@
     IStream                    *m_pStream;
     ULONG                       m_uObjIdx;
-    /** Event being triggered when reading the transfer list been completed.*/
+    /** List of (cached) file system root objects. */
+    FsObjEntryList              m_lstRootEntries;
+    /** Event being triggered when reading the transfer list been completed. */
     RTSEMEVENT                  m_EventListComplete;
+    /** Event being triggered when the transfer has been completed. */
     RTSEMEVENT                  m_EventTransferComplete;
+    UINT                        m_cfFileDescriptorA;
+    UINT                        m_cfFileDescriptorW;
+    UINT                        m_cfFileContents;
 };
 
@@ -286 +301 @@
 public:
 
-    VBoxClipboardWinStreamImpl(VBoxClipboardWinDataObject *pParent,
-                               PSHAREDCLIPBOARDURITRANSFER pTransfer, SHAREDCLIPBOARDOBJHANDLE hObj);
+    VBoxClipboardWinStreamImpl(VBoxClipboardWinDataObject *pParent, PSHAREDCLIPBOARDURITRANSFER pTransfer,
+                               const Utf8Str &strPath, PSHAREDCLIPBOARDFSOBJINFO pObjInfo);
     virtual ~VBoxClipboardWinStreamImpl(void);
 
@@ -312 +327 @@
 public: /* Own methods. */
 
-    static HRESULT Create(VBoxClipboardWinDataObject *pParent,
-                          PSHAREDCLIPBOARDURITRANSFER pTransfer, uint64_t uObjIdx, IStream **ppStream);
-
+    static HRESULT Create(VBoxClipboardWinDataObject *pParent, PSHAREDCLIPBOARDURITRANSFER pTransfer, const Utf8Str &strPath,
+                          PSHAREDCLIPBOARDFSOBJINFO pObjInfo, IStream **ppStream);
 private:
 
@@ -323 +337 @@
     /** Pointer to the associated URI transfer. */
     PSHAREDCLIPBOARDURITRANSFER    m_pURITransfer;
-    /** Handle to the associated URI object. */
+    /** The object handle to use. */
     SHAREDCLIPBOARDOBJHANDLE       m_hObj;
+    /** Object path. */
+    Utf8Str                        m_strPath;
+    /** (Cached) object information. */
+    SHAREDCLIPBOARDFSOBJINFO       m_objInfo;
+    /** Number of bytes already processed. */
+    uint64_t                       m_cbProcessed;
+    /** Whether we already notified the parent of completion or not. */
+    bool                           m_fNotifiedComplete;
 };
 

trunk/include/VBox/HostServices/VBoxClipboardSvc.h

@@ -361 +361 @@
 #define VBOX_SHAREDCLIPBOARD_REPLYMSGTYPE_INVALID           0
 #define VBOX_SHAREDCLIPBOARD_REPLYMSGTYPE_LIST_OPEN         1
-#define VBOX_SHAREDCLIPBOARD_REPLYMSGTYPE_OBJ_OPEN          2
+#define VBOX_SHAREDCLIPBOARD_REPLYMSGTYPE_LIST_CLOSE        2
+#define VBOX_SHAREDCLIPBOARD_REPLYMSGTYPE_OBJ_OPEN          3
+#define VBOX_SHAREDCLIPBOARD_REPLYMSGTYPE_OBJ_CLOSE         4
 
 /**
@@ -413 +415 @@
     /** uin32_t, out: Size (in bytes) of string list. */
     HGCMFunctionParameter cbRoots;
-    /** pointer, out: string list (separated with CRLF) containing the root items. */
+    /** pointer, out: string list (separated with \r\n) containing the root items. */
     HGCMFunctionParameter pvRoots;
 } VBoxClipboardRootsMsg;
@@ -650 +652 @@
 
 #endif /* !VBOX_INCLUDED_HostServices_VBoxClipboardSvc_h */
+