Changeset 50305 in vbox for trunk/include

Timestamp:

Feb 3, 2014 10:47:45 AM (11 years ago)

Author:

vboxsync

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

92001

Message:

DnD: Update.

Location:

trunk/include/VBox

Files:

• HostServices/DragAndDropSvc.h (modified) (5 diffs)
• VBoxGuestLib.h (modified) (2 diffs)

trunk/include/VBox/HostServices/DragAndDropSvc.h

@@ -68 +68 @@
     HOST_DND_SET_MODE                  = 100,
 
-    /* H->G */
+    /*
+     * Host -> Guest messages
+     */
+
     HOST_DND_HG_EVT_ENTER              = 200,
     HOST_DND_HG_EVT_MOVE,
@@ -78 +81 @@
     HOST_DND_HG_SND_DATA,
     /** Sent when the actual buffer for HOST_DND_HG_SND_DATA
-     *  was too small. */
+     *  was too small, issued by the DnD host service. */
     HOST_DND_HG_SND_MORE_DATA,
+    /** Directory entry to be handled on the guest. */
     HOST_DND_HG_SND_DIR,
+    /** File entry to be handled on the guest. */
     HOST_DND_HG_SND_FILE,
 
-    /* G->H */
+    /*
+     * Guest -> Host messages
+     */
+
     /** The host asks the guest whether a DnD operation
      *  is in progress when the mouse leaves the guest window. */
@@ -90 +98 @@
      *  has been started and that the host wants the data in
      *  a specific mime-type. */
-    HOST_DND_GH_EVT_DROPPED
+    HOST_DND_GH_EVT_DROPPED,
+
+    HOST_DND_GH_RECV_DIR               = 650,
+    HOST_DND_GH_RECV_FILE
 };
 
@@ -107 +118 @@
 
     /* H->G */
+    /** The guest acknowledges that the pending DnD data from
+     *  the host can be dropped on the currently selected source
+     *  on the guest. */
     GUEST_DND_HG_ACK_OP                = 400,
+    /** The guest requests the actual DnD data to be sent
+     *  from the host. */
     GUEST_DND_HG_REQ_DATA,
     GUEST_DND_HG_EVT_PROGRESS,
@@ -119 +135 @@
     GUEST_DND_GH_ACK_PENDING           = 500,
     GUEST_DND_GH_SND_DATA,
-    GUEST_DND_GH_EVT_ERROR
+    GUEST_DND_GH_EVT_ERROR,
+
+    GUEST_DND_GH_SND_DIR               = 700,
+    GUEST_DND_GH_SND_FILE
 };
 

trunk/include/VBox/VBoxGuestLib.h

@@ -4 +4 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -722 +722 @@
 VBGLR3DECL(int)     VbglR3DnDHGRequestData(uint32_t u32ClientId, const char* pcszFormat);
 #  ifdef VBOX_WITH_DRAG_AND_DROP_GH
-VBGLR3DECL(int)     VbglR3DnDGHAcknowledgePending(uint32_t u32ClientId, uint32_t uDefAction, uint32_t uAllActions, const char* pcszFormat);
+VBGLR3DECL(int)     VbglR3DnDGHAcknowledgePending(uint32_t u32ClientId, uint32_t uDefAction, uint32_t uAllActions, const char* pcszFormats);
 VBGLR3DECL(int)     VbglR3DnDGHSendData(uint32_t u32ClientId, void *pvData, uint32_t cbData);
 VBGLR3DECL(int)     VbglR3DnDGHErrorEvent(uint32_t u32ClientId, int rcOp);