Changeset 50561 in vbox for trunk/include

Timestamp:

Feb 24, 2014 9:07:22 PM (11 years ago)

Author:

vboxsync

Message:

DnD: Update, bugfixes.

Location:

trunk/include/VBox

Files:

• GuestHost/DragAndDrop.h (modified) (2 diffs)
• HostServices/DragAndDropSvc.h (modified) (6 diffs)
• HostServices/Service.h (modified) (1 diff)
• VBoxGuestLib.h (modified) (1 diff)

trunk/include/VBox/GuestHost/DragAndDrop.h

@@ -56 +56 @@
 public:
 
-    RTCString GetSourcePath(void) const { return m_strSrcPath; }
-    RTCString GetDestPath(void) const { return m_strDstPath; }
+    const RTCString &GetSourcePath(void) const { return m_strSrcPath; }
+    const RTCString &GetDestPath(void) const { return m_strDstPath; }
     uint32_t GetMode(void) const { return m_fMode; }
     uint64_t GetSize(void) const { return m_cbSize; }
@@ -110 +110 @@
     void RemoveFirst(void);
     int RootFromURIData(const void *pvData, size_t cbData, uint32_t fFlags);
-    RTCString RootToString(const RTCString &strBasePath = "");
+    RTCString RootToString(const RTCString &strBasePath = "", const RTCString &strSeparator = "\r\n");
     size_t RootCount(void) { return m_lstRoot.size(); }
     size_t TotalBytes(void) { return m_cbTotal; }

trunk/include/VBox/HostServices/DragAndDropSvc.h

@@ -73 +73 @@
 
     HOST_DND_HG_EVT_ENTER              = 200,
-    HOST_DND_HG_EVT_MOVE,
-    HOST_DND_HG_EVT_LEAVE,
-    HOST_DND_HG_EVT_DROPPED,
-    HOST_DND_HG_EVT_CANCEL,
+    HOST_DND_HG_EVT_MOVE               = 201,
+    HOST_DND_HG_EVT_LEAVE              = 202,
+    HOST_DND_HG_EVT_DROPPED            = 203,
+    HOST_DND_HG_EVT_CANCEL             = 204,
     /** Gets the actual MIME data, based on
      *  the format(s) specified by HOST_DND_HG_EVT_ENTER. */
-    HOST_DND_HG_SND_DATA,
+    HOST_DND_HG_SND_DATA               = 205,
     /** Sent when the actual buffer for HOST_DND_HG_SND_DATA
      *  was too small, issued by the DnD host service. */
-    HOST_DND_HG_SND_MORE_DATA,
+    HOST_DND_HG_SND_MORE_DATA          = 206,
     /** Directory entry to be handled on the guest. */
-    HOST_DND_HG_SND_DIR,
+    HOST_DND_HG_SND_DIR                = 207,
     /** File entry to be handled on the guest. */
-    HOST_DND_HG_SND_FILE,
+    HOST_DND_HG_SND_FILE               = 208,
 
     /*
@@ -101 +101 @@
 
     HOST_DND_GH_RECV_DIR               = 650,
-    HOST_DND_GH_RECV_FILE
+    HOST_DND_GH_RECV_FILE              = 670
 };
 
@@ -124 +124 @@
     /** The guest requests the actual DnD data to be sent
      *  from the host. */
-    GUEST_DND_HG_REQ_DATA,
-    GUEST_DND_HG_EVT_PROGRESS,
+    GUEST_DND_HG_REQ_DATA              = 401,
+    GUEST_DND_HG_EVT_PROGRESS          = 402,
 
     /* G->H */
@@ -135 +135 @@
     GUEST_DND_GH_ACK_PENDING           = 500,
     /**
-     * Sends data of the requsted MIME type to the host. There can
+     * Sends data of the requested format to the host. There can
      * be more than one message if the actual data does not fit
      * into one.
      */
-    GUEST_DND_GH_SND_DATA,
-    GUEST_DND_GH_EVT_ERROR,
+    GUEST_DND_GH_SND_DATA              = 501,
+    GUEST_DND_GH_EVT_ERROR             = 502,
 
     GUEST_DND_GH_SND_DIR               = 700,
-    GUEST_DND_GH_SND_FILE
+    GUEST_DND_GH_SND_FILE              = 701
 };
 
@@ -376 +376 @@
     /** Total bytes to send. This can be more than
      *  the data block specified in pvData above, e.g.
-     *  when sending over file objects. */
+     *  when sending over file objects afterwards. */
     HGCMFunctionParameter cbTotalBytes; /* OUT uint32_t */
 } VBOXDNDGHSENDDATAMSG;
@@ -417 +417 @@
 
     /**
-     * GH Cancel Data event.
-     *
-     * Used by:
-     * GUEST_DND_GH_EVT_CANCEL
+     * GH Error event.
+     *
+     * Used by:
+     * GUEST_DND_GH_EVT_ERROR
      */
     HGCMFunctionParameter uRC;          /* OUT uint32_t */

trunk/include/VBox/HostServices/Service.h

@@ -43 +43 @@
 public:
     Message(uint32_t uMsg, uint32_t cParms, VBOXHGCMSVCPARM aParms[])
-      : m_uMsg(0)
-      , m_cParms(0)
-      , m_paParms(0)
+        : m_uMsg(0)
+        , m_cParms(0)
+        , m_paParms(0)
     {
         setData(uMsg, cParms, aParms);

trunk/include/VBox/VBoxGuestLib.h

@@ -724 +724 @@
 VBGLR3DECL(int)     VbglR3DnDGHAcknowledgePending(uint32_t u32ClientId, uint32_t uDefAction, uint32_t uAllActions, const char* pcszFormats);
 VBGLR3DECL(int)     VbglR3DnDGHSendData(uint32_t u32ClientId, const char *pszFormat, void *pvData, uint32_t cbData);
-VBGLR3DECL(int)     VbglR3DnDGHErrorEvent(uint32_t u32ClientId, int rcOp);
+VBGLR3DECL(int)     VbglR3DnDGHSendError(uint32_t u32ClientId, int rcOp);
 #  endif /* VBOX_WITH_DRAG_AND_DROP_GH */
 /** @} */