VirtualBox

Changeset 85745 in vbox


Ignore:
Timestamp:
Aug 13, 2020 8:37:09 AM (4 years ago)
Author:
vboxsync
Message:

DnD: Renaming -- prefix all HGCM function number defines with [GUEST|HOST]_DND_FN_ to better distinguish from other defines.

Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/HostServices/DragAndDropSvc.h

    r85722 r85745  
    4949 *         + Added VBOXDNDSNDDATAHDR and VBOXDNDCBSNDDATAHDRDATA to support (simple) accounting of objects
    5050 *           being transferred, along with supplying separate meta data size (which is part of the total size being sent).
    51  *         + Added new HOST_DND_HG_SND_DATA_HDR + GUEST_DND_GH_SND_DATA_HDR commands which now allow specifying an optional
     51 *         + Added new HOST_DND_FN_HG_SND_DATA_HDR + GUEST_DND_FN_GH_SND_DATA_HDR commands which now allow specifying an optional
    5252 *           compression type and defining a checksum for the overall data transfer.
    5353 *         + Enhannced VBOXDNDGHSENDDATAMSG to support (rolling) checksums for the supplied data block.
    5454 *         + VBOXDNDHGSENDDATAMSG and VBOXDNDGHSENDDATAMSG can now contain an optional checksum for the current data block.
    5555 *         | VBOXDNDHGSENDFILEDATAMSG and VBOXDNDGHSENDFILEDATAMSG are now sharing the same HGCM mesasge.
    56  *         - Removed unused HOST_DND_GH_RECV_DIR, HOST_DND_GH_RECV_FILE_DATA and HOST_DND_GH_RECV_FILE_HDR commands.
     56 *         - Removed unused HOST_DND_FN_GH_RECV_DIR, HOST_DND_FN_GH_RECV_FILE_DATA and HOST_DND_FN_GH_RECV_FILE_HDR commands.
    5757 *
    5858 *     VBox 6.1.x and up, current:
    59  *         + Added GUEST_DND_QUERY_FEATURES + GUEST_DND_REPORT_FEATURES.
     59 *         + Added GUEST_DND_FN_QUERY_FEATURES + GUEST_DND_FN_REPORT_FEATURES.
    6060 *         - Protocol versioning support in VBOXDNDCONNECTMSG is now marked as being deprecated.
    6161 *
    6262 ** @todo:
    6363 * - Split up messages which use VBOXDNDHGACTIONMSG into own functions and remove parameters which
    64  *   are not actually needed / used by a function. Why does HOST_DND_HG_EVT_MOVE need all the format stuff, for example?
     64 *   are not actually needed / used by a function. Why does HOST_DND_FN_HG_EVT_MOVE need all the format stuff, for example?
    6565 */
    6666
    … …  
    9191{
    9292    /** The host sets a new DnD mode. */
    93     HOST_DND_SET_MODE                  = 100,
     93    HOST_DND_FN_SET_MODE                  = 100,
    9494    /** The host requests to cancel the current DnD operation on
    9595     *  the guest side. This can happen on user request on the host's
    … …  
    9999     *        not rely on an answer from the guest side in order to
    100100     *        properly cancel the operation. */
    101     HOST_DND_CANCEL                    = 204,
     101    HOST_DND_FN_CANCEL                    = 204,
    102102
    103103    /*
    … …  
    107107    /** The host enters the VM window for starting an actual
    108108     *  DnD operation. */
    109     HOST_DND_HG_EVT_ENTER              = 200,
     109    HOST_DND_FN_HG_EVT_ENTER              = 200,
    110110    /** The host's DnD cursor moves within the VM window. */
    111     HOST_DND_HG_EVT_MOVE               = 201,
     111    HOST_DND_FN_HG_EVT_MOVE               = 201,
    112112    /** The host leaves the guest VM window. */
    113     HOST_DND_HG_EVT_LEAVE              = 202,
     113    HOST_DND_FN_HG_EVT_LEAVE              = 202,
    114114    /** The host issues a "drop" event, meaning that the host is
    115115     *  ready to transfer data over to the guest. */
    116     HOST_DND_HG_EVT_DROPPED            = 203,
     116    HOST_DND_FN_HG_EVT_DROPPED            = 203,
    117117    /** The host sends the data header at the beginning of a (new)
    118118     *  data transfer. */
    119     HOST_DND_HG_SND_DATA_HDR           = 210,
     119    HOST_DND_FN_HG_SND_DATA_HDR           = 210,
    120120    /**
    121121     * The host sends the actual meta data, based on
    122      * the format(s) specified by HOST_DND_HG_EVT_ENTER.
     122     * the format(s) specified by HOST_DND_FN_HG_EVT_ENTER.
    123123     *
    124124     * Protocol v1/v2: If the guest supplied buffer too small to send
    125      *                 the actual data, the host will send a HOST_DND_HG_SND_MORE_DATA
     125     *                 the actual data, the host will send a HOST_DND_FN_HG_SND_MORE_DATA
    126126     *                 message as follow-up.
    127127     * Protocol v3+:   The incoming meta data size is specified upfront in the
    128      *                 HOST_DND_HG_SND_DATA_HDR message and must be handled accordingly.
     128     *                 HOST_DND_FN_HG_SND_DATA_HDR message and must be handled accordingly.
    129129     */
    130     HOST_DND_HG_SND_DATA               = 205,
     130    HOST_DND_FN_HG_SND_DATA               = 205,
    131131    /** The host sends more data in case the data did not entirely fit in
    132      *  the HOST_DND_HG_SND_DATA message. */
     132     *  the HOST_DND_FN_HG_SND_DATA message. */
    133133    /** @todo Deprecated function; do not use anymore. */
    134     HOST_DND_HG_SND_MORE_DATA          = 206,
     134    HOST_DND_FN_HG_SND_MORE_DATA          = 206,
    135135    /** The host sends a directory entry to the guest. */
    136     HOST_DND_HG_SND_DIR                = 207,
     136    HOST_DND_FN_HG_SND_DIR                = 207,
    137137    /** The host sends a file data chunk to the guest. */
    138     HOST_DND_HG_SND_FILE_DATA          = 208,
     138    HOST_DND_FN_HG_SND_FILE_DATA          = 208,
    139139    /** The host sends a file header to the guest.
    140140     *  Note: Only for protocol version 2 and up (>= VBox 5.0). */
    141     HOST_DND_HG_SND_FILE_HDR           = 209,
     141    HOST_DND_FN_HG_SND_FILE_HDR           = 209,
    142142
    143143    /*
    … …  
    147147    /** The host asks the guest whether a DnD operation
    148148     *  is in progress when the mouse leaves the guest window. */
    149     HOST_DND_GH_REQ_PENDING            = 600,
     149    HOST_DND_FN_GH_REQ_PENDING            = 600,
    150150    /** The host informs the guest that a DnD drop operation
    151151     *  has been started and that the host wants the data in
    152152     *  a specific MIME type. */
    153     HOST_DND_GH_EVT_DROPPED            = 601,
     153    HOST_DND_FN_GH_EVT_DROPPED            = 601,
    154154    /** Blow the type up to 32-bit. */
    155     HOST_DND_32BIT_HACK                = 0x7fffffff
     155    HOST_DND_FN_32BIT_HACK                = 0x7fffffff
    156156};
    157157
    … …  
    168168     * protocol version and flags.
    169169     * Note: New since protocol version 2. */
    170     GUEST_DND_CONNECT                  = 10,
     170    GUEST_DND_FN_CONNECT                  = 10,
    171171
    172172    /** The guest client disconnects from the HGCM service. */
    173     GUEST_DND_DISCONNECT               = 11,
     173    GUEST_DND_FN_DISCONNECT               = 11,
    174174
    175175    /** Report guest side feature flags and retrieve the host ones.
    … …  
    185185     * @since   6.1.x
    186186     */
    187     GUEST_DND_REPORT_FEATURES          = 12,
     187    GUEST_DND_FN_REPORT_FEATURES          = 12,
    188188
    189189    /** Query the host ones feature masks.
    … …  
    199199     * @since   6.1.x
    200200     */
    201     GUEST_DND_QUERY_FEATURES           = 13,
     201    GUEST_DND_FN_QUERY_FEATURES           = 13,
    202202
    203203    /**
    … …  
    205205     * on the guest side. This can be a blocking call.
    206206     */
    207     GUEST_DND_GET_NEXT_HOST_MSG        = 300,
     207    GUEST_DND_FN_GET_NEXT_HOST_MSG        = 300,
    208208
    209209    /*
    … …  
    213213    /** The guest acknowledges that a pending DnD operation from the host
    214214     *  can be dropped on the currently selected area on the guest. */
    215     GUEST_DND_HG_ACK_OP                = 400,
     215    GUEST_DND_FN_HG_ACK_OP                = 400,
    216216    /** The guest requests the actual DnD data to be sent from the host. */
    217     GUEST_DND_HG_REQ_DATA              = 401,
     217    GUEST_DND_FN_HG_REQ_DATA              = 401,
    218218    /** The guest reports back its progress back to the host. */
    219     GUEST_DND_HG_EVT_PROGRESS          = 402,
     219    GUEST_DND_FN_HG_EVT_PROGRESS          = 402,
    220220
    221221    /*
    … …  
    228228     * dragged over to the host.
    229229     */
    230     GUEST_DND_GH_ACK_PENDING           = 500,
     230    GUEST_DND_FN_GH_ACK_PENDING           = 500,
    231231    /** The guest sends the data header at the beginning of a (new)
    232232     *  data transfer. */
    233     GUEST_DND_GH_SND_DATA_HDR          = 503,
     233    GUEST_DND_FN_GH_SND_DATA_HDR          = 503,
    234234    /**
    235235     * The guest sends data of the requested format to the host. There can
    … …  
    237237     * into one.
    238238     */
    239     GUEST_DND_GH_SND_DATA              = 501,
     239    GUEST_DND_FN_GH_SND_DATA              = 501,
    240240    /** The guest reports an error back to the host. */
    241     GUEST_DND_GH_EVT_ERROR             = 502,
     241    GUEST_DND_FN_GH_EVT_ERROR             = 502,
    242242    /** The guest sends a directory entry to the host. */
    243     GUEST_DND_GH_SND_DIR               = 700,
     243    GUEST_DND_FN_GH_SND_DIR               = 700,
    244244    /** The guest sends file data to the host.
    245245     *  Note: On protocol version 1 this also contains the file name
    246246     *        and other attributes. */
    247     GUEST_DND_GH_SND_FILE_DATA         = 701,
     247    GUEST_DND_FN_GH_SND_FILE_DATA         = 701,
    248248    /** The guest sends a file header to the host, marking the
    249249     *  beginning of a (new) file transfer.
    250250     *  Note: Available since protocol version 2 (VBox 5.0). */
    251     GUEST_DND_GH_SND_FILE_HDR          = 702,
     251    GUEST_DND_FN_GH_SND_FILE_HDR          = 702,
    252252    /** Blow the type up to 32-bit. */
    253     GUEST_DND_32BIT_HACK               = 0x7fffffff
     253    GUEST_DND_FN_32BIT_HACK               = 0x7fffffff
    254254};
    255255
    256256/** @name VBOX_DND_GF_XXX - Guest features.
    257  * @sa GUEST_DND_REPORT_FEATURES
     257 * @sa GUEST_DND_FN_REPORT_FEATURES
    258258 * @{ */
    259259/** No flags set. */
    … …  
    297297 *
    298298 * Used by:
    299  * HOST_DND_HG_EVT_ENTER
    300  * HOST_DND_HG_EVT_MOVE
    301  * HOST_DND_HG_EVT_DROPPED
     299 * HOST_DND_FN_HG_EVT_ENTER
     300 * HOST_DND_FN_HG_EVT_MOVE
     301 * HOST_DND_FN_HG_EVT_DROPPED
    302302 */
    303303typedef struct HGCMMsgHGAction
    … …  
    336336 *
    337337 * Used by:
    338  * HOST_DND_HG_EVT_LEAVE
     338 * HOST_DND_FN_HG_EVT_LEAVE
    339339 */
    340340typedef struct HGCMMsgHGLeave
    … …  
    355355 *
    356356 * Used by:
    357  * HOST_DND_HG_EVT_CANCEL
     357 * HOST_DND_FN_HG_EVT_CANCEL
    358358 */
    359359typedef struct HGCMMsgHGCancel
    … …  
    374374 *
    375375 * Used by:
    376  * HOST_DND_HG_SND_DATA_HDR
    377  * GUEST_DND_GH_SND_DATA_HDR
     376 * HOST_DND_FN_HG_SND_DATA_HDR
     377 * GUEST_DND_FN_GH_SND_DATA_HDR
    378378 *
    379379 * New since protocol v3.
    … …  
    418418 *
    419419 * Used by:
    420  * HOST_DND_HG_SND_DATA
     420 * HOST_DND_FN_HG_SND_DATA
    421421 */
    422422typedef struct HGCMMsgHGSendData
    … …  
    459459 *
    460460 * Used by:
    461  * HOST_DND_HG_SND_MORE_DATA
     461 * HOST_DND_FN_HG_SND_MORE_DATA
    462462 */
    463463typedef struct HGCMMsgHGSendMoreData
    … …  
    473473 *
    474474 * Used by:
    475  * HOST_DND_HG_SND_DIR
    476  * GUEST_DND_GH_SND_DIR
     475 * HOST_DND_FN_HG_SND_DIR
     476 * GUEST_DND_FN_GH_SND_DIR
    477477 */
    478478typedef struct HGCMMsgHGSendDir
    … …  
    510510 *
    511511 * Used by:
    512  * HOST_DND_HG_SND_FILE_HDR
    513  * GUEST_DND_GH_SND_FILE_HDR
     512 * HOST_DND_FN_HG_SND_FILE_HDR
     513 * GUEST_DND_FN_GH_SND_FILE_HDR
    514514 */
    515515typedef struct HGCMMsgHGSendFileHdr
    … …  
    535535 *
    536536 * Used by:
    537  * HOST_DND_HG_SND_FILE
     537 * HOST_DND_FN_HG_SND_FILE
    538538 */
    539539typedef struct HGCMMsgHGSendFileData
    … …  
    591591 *
    592592 * Used by:
    593  * HOST_DND_GH_REQ_PENDING
     593 * HOST_DND_FN_GH_REQ_PENDING
    594594 */
    595595typedef struct HGCMMsgGHReqPending
    … …  
    619619 *
    620620 * Used by:
    621  * HOST_DND_GH_EVT_DROPPED
     621 * HOST_DND_FN_GH_EVT_DROPPED
    622622 */
    623623typedef struct HGCMMsgGHDropped
    … …  
    660660 *
    661661 * Used by:
    662  * GUEST_DND_GET_NEXT_HOST_MSG
     662 * GUEST_DND_FN_GET_NEXT_HOST_MSG
    663663 */
    664664typedef struct HGCMMsgGetNext
    … …  
    680680 *
    681681 * Used by:
    682  * GUEST_DND_CONNECT
     682 * GUEST_DND_FN_CONNECT
    683683 */
    684684typedef struct HGCMMsgConnect
    … …  
    714714 *
    715715 * Used by:
    716  * GUEST_DND_HG_ACK_OP
     716 * GUEST_DND_FN_HG_ACK_OP
    717717 */
    718718typedef struct HGCMMsgHGAck
    … …  
    739739 *
    740740 * Used by:
    741  * GUEST_DND_HG_REQ_DATA
     741 * GUEST_DND_FN_HG_REQ_DATA
    742742 */
    743743typedef struct HGCMMsgHGReqData
    … …  
    788788 *
    789789 * Used by:
    790  * GUEST_DND_GH_ACK_PENDING
     790 * GUEST_DND_FN_GH_ACK_PENDING
    791791 */
    792792typedef struct HGCMMsgGHAckPending
    … …  
    819819 *
    820820 * Used by:
    821  * GUEST_DND_GH_SND_DATA_HDR
     821 * GUEST_DND_FN_GH_SND_DATA_HDR
    822822 *
    823823 * New since protocol v3.
    … …  
    829829 *
    830830 * Used by:
    831  * GUEST_DND_GH_SND_DATA
     831 * GUEST_DND_FN_GH_SND_DATA
    832832 */
    833833typedef struct HGCMMsgGHSendData
    … …  
    865865 *
    866866 * Used by:
    867  * GUEST_DND_GH_SND_DIR
     867 * GUEST_DND_FN_GH_SND_DIR
    868868 */
    869869typedef struct HGCMMsgHGSendDir HGCMMsgGHSendDir;
    … …  
    873873 *
    874874 * Used by:
    875  * GUEST_DND_GH_SND_FILE_HDR
     875 * GUEST_DND_FN_GH_SND_FILE_HDR
    876876 *
    877877 * New since protocol v2.
    … …  
    883883 *
    884884 * Used by:
    885  * GUEST_DND_GH_SND_FILE_DATA
     885 * GUEST_DND_FN_GH_SND_FILE_DATA
    886886 */
    887887typedef struct HGCMMsgHGSendFileData HGCMMsgGHSendFileData;
    … …  
    891891 *
    892892 * Used by:
    893  * GUEST_DND_GH_EVT_ERROR
     893 * GUEST_DND_FN_GH_EVT_ERROR
    894894 */
    895895typedef struct HGCMMsgGHError
    … …  
    924924enum eDnDCallbackMagics
    925925{
    926     CB_MAGIC_DND_CONNECT                   = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_CONNECT, 0),
    927     CB_MAGIC_DND_REPORT_FEATURES           = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_REPORT_FEATURES, 0),
    928     CB_MAGIC_DND_HG_GET_NEXT_HOST_MSG      = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_GET_NEXT_HOST_MSG, 0),
    929     CB_MAGIC_DND_HG_ACK_OP                 = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_HG_ACK_OP, 0),
    930     CB_MAGIC_DND_HG_REQ_DATA               = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_HG_REQ_DATA, 0),
    931     CB_MAGIC_DND_HG_EVT_PROGRESS           = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_HG_EVT_PROGRESS, 0),
    932     CB_MAGIC_DND_GH_ACK_PENDING            = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_GH_ACK_PENDING, 0),
    933     CB_MAGIC_DND_GH_SND_DATA               = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_GH_SND_DATA, 0),
    934     CB_MAGIC_DND_GH_SND_DATA_HDR           = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_GH_SND_DATA_HDR, 0),
    935     CB_MAGIC_DND_GH_SND_DIR                = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_GH_SND_DIR, 0),
    936     CB_MAGIC_DND_GH_SND_FILE_HDR           = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_GH_SND_FILE_HDR, 0),
    937     CB_MAGIC_DND_GH_SND_FILE_DATA          = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_GH_SND_FILE_DATA, 0),
    938     CB_MAGIC_DND_GH_EVT_ERROR              = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_GH_EVT_ERROR, 0)
     926    CB_MAGIC_DND_CONNECT                   = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_FN_CONNECT, 0),
     927    CB_MAGIC_DND_REPORT_FEATURES           = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_FN_REPORT_FEATURES, 0),
     928    CB_MAGIC_DND_HG_GET_NEXT_HOST_MSG      = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_FN_GET_NEXT_HOST_MSG, 0),
     929    CB_MAGIC_DND_HG_ACK_OP                 = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_FN_HG_ACK_OP, 0),
     930    CB_MAGIC_DND_HG_REQ_DATA               = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_FN_HG_REQ_DATA, 0),
     931    CB_MAGIC_DND_HG_EVT_PROGRESS           = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_FN_HG_EVT_PROGRESS, 0),
     932    CB_MAGIC_DND_GH_ACK_PENDING            = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_FN_GH_ACK_PENDING, 0),
     933    CB_MAGIC_DND_GH_SND_DATA               = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_FN_GH_SND_DATA, 0),
     934    CB_MAGIC_DND_GH_SND_DATA_HDR           = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_FN_GH_SND_DATA_HDR, 0),
     935    CB_MAGIC_DND_GH_SND_DIR                = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_FN_GH_SND_DIR, 0),
     936    CB_MAGIC_DND_GH_SND_FILE_HDR           = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_FN_GH_SND_FILE_HDR, 0),
     937    CB_MAGIC_DND_GH_SND_FILE_DATA          = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_FN_GH_SND_FILE_DATA, 0),
     938    CB_MAGIC_DND_GH_EVT_ERROR              = VBOX_DND_CB_MAGIC_MAKE(GUEST_DND_FN_GH_EVT_ERROR, 0)
    939939};
    940940

  • trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDnD.cpp

    r85695 r85745  
    570570                    }
    571571
    572                     /* Note: After HOST_DND_HG_EVT_ENTER there immediately is a move
     572                    /* Note: After HOST_DND_FN_HG_EVT_ENTER there immediately is a move
    573573                     *       event, so fall through is intentional here. */
    574574                    RT_FALL_THROUGH();
    … …  
    12041204    /**
    12051205     * Some notes regarding guest cursor movement:
    1206      * - The host only sends an HOST_DND_GH_REQ_PENDING message to the guest
     1206     * - The host only sends an HOST_DND_FN_GH_REQ_PENDING message to the guest
    12071207     *   if the mouse cursor is outside the VM's window.
    12081208     * - The guest does not know anything about the host's cursor

  • trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibDragAndDrop.cpp

    r85712 r85745  
    7373
    7474    HGCMMsgGetNext Msg;
    75     VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_GET_NEXT_HOST_MSG, 3);
     75    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_FN_GET_NEXT_HOST_MSG, 3);
    7676    Msg.uMsg.SetUInt32(0);
    7777    Msg.cParms.SetUInt32(0);
    … …  
    172172/**
    173173 * Host -> Guest
    174  * Utility function to receive a HOST_DND_HG_EVT_LEAVE message from the host.
     174 * Utility function to receive a HOST_DND_FN_HG_EVT_LEAVE message from the host.
    175175 *
    176176 * @returns IPRT status code.
    … …  
    182182
    183183    HGCMMsgHGLeave Msg;
    184     VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_HG_EVT_LEAVE, 1);
     184    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_FN_HG_EVT_LEAVE, 1);
    185185    /** @todo Context ID not used yet. */
    186186    Msg.u.v3.uContext.SetUInt32(0);
    … …  
    191191/**
    192192 * Host -> Guest
    193  * Utility function to receive a HOST_DND_HG_EVT_CANCEL message from the host.
     193 * Utility function to receive a HOST_DND_FN_HG_EVT_CANCEL message from the host.
    194194 *
    195195 * @returns IPRT status code.
    … …  
    201201
    202202    HGCMMsgHGCancel Msg;
    203     VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_CANCEL, 1);
     203    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_FN_CANCEL, 1);
    204204    /** @todo Context ID not used yet. */
    205205    Msg.u.v3.uContext.SetUInt32(0);
    … …  
    210210/**
    211211 * Host -> Guest
    212  * Utility function to receive a HOST_DND_HG_SND_DIR message from the host.
     212 * Utility function to receive a HOST_DND_FN_HG_SND_DIR message from the host.
    213213 *
    214214 * @returns IPRT status code.
    … …  
    232232
    233233    HGCMMsgHGSendDir Msg;
    234     VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_HG_SND_DIR, 4);
     234    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_FN_HG_SND_DIR, 4);
    235235    /** @todo Context ID not used yet. */
    236236    Msg.u.v3.uContext.SetUInt32(0);
    … …  
    254254/**
    255255 * Host -> Guest
    256  * Utility function to receive a HOST_DND_HG_SND_FILE_DATA message from the host.
     256 * Utility function to receive a HOST_DND_FN_HG_SND_FILE_DATA message from the host.
    257257 *
    258258 * @returns IPRT status code.
    … …  
    273273
    274274    HGCMMsgHGSendFileData Msg;
    275     VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_HG_SND_FILE_DATA, 5);
     275    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_FN_HG_SND_FILE_DATA, 5);
    276276    Msg.u.v3.uContext.SetUInt32(0);
    277277    Msg.u.v3.pvData.SetPtr(pvData, cbData);
    … …  
    294294/**
    295295 * Host -> Guest
    296  * Utility function to receive the HOST_DND_HG_SND_FILE_HDR message from the host.
     296 * Utility function to receive the HOST_DND_FN_HG_SND_FILE_HDR message from the host.
    297297 *
    298298 * @returns IPRT status code.
    … …  
    319319
    320320    HGCMMsgHGSendFileHdr Msg;
    321     VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_HG_SND_FILE_HDR, 6);
     321    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_FN_HG_SND_FILE_HDR, 6);
    322322    Msg.uContext.SetUInt32(0); /** @todo Not used yet. */
    323323    Msg.pvName.SetPtr(pszFilename, cbFilename);
    … …  
    410410            switch (uNextMsg)
    411411            {
    412                 case HOST_DND_HG_SND_DIR:
     412                case HOST_DND_FN_HG_SND_DIR:
    413413                {
    414414                    rc = vbglR3DnDHGRecvDir(pCtx,
    … …  
    417417                                            &cbPathName,
    418418                                            &fMode);
    419                     LogFlowFunc(("HOST_DND_HG_SND_DIR: "
     419                    LogFlowFunc(("HOST_DND_FN_HG_SND_DIR: "
    420420                                 "pszPathName=%s, cbPathName=%RU32, fMode=0x%x, rc=%Rrc\n",
    421421                                 szPathName, cbPathName, fMode, rc));
    … …  
    445445                    break;
    446446                }
    447                 case HOST_DND_HG_SND_FILE_HDR:
     447                case HOST_DND_FN_HG_SND_FILE_HDR:
    448448                    RT_FALL_THROUGH();
    449                 case HOST_DND_HG_SND_FILE_DATA:
     449                case HOST_DND_FN_HG_SND_FILE_DATA:
    450450                {
    451                     if (uNextMsg == HOST_DND_HG_SND_FILE_HDR)
     451                    if (uNextMsg == HOST_DND_FN_HG_SND_FILE_HDR)
    452452                    {
    453453                        rc = vbglR3DnDHGRecvFileHdr(pCtx,
    … …  
    457457                                                    &fMode,
    458458                                                    &cbFileSize);
    459                         LogFlowFunc(("HOST_DND_HG_SND_FILE_HDR: "
     459                        LogFlowFunc(("HOST_DND_FN_HG_SND_FILE_HDR: "
    460460                                     "szPathName=%s, fFlags=0x%x, fMode=0x%x, cbFileSize=%RU64, rc=%Rrc\n",
    461461                                     szPathName, fFlags, fMode, cbFileSize, rc));
    … …  
    467467                                                     cbChunkMax,
    468468                                                     &cbChunkRead);
    469                         LogFlowFunc(("HOST_DND_HG_SND_FILE_DATA: "
     469                        LogFlowFunc(("HOST_DND_FN_HG_SND_FILE_DATA: "
    470470                                     "cbChunkRead=%RU32, rc=%Rrc\n", cbChunkRead, rc));
    471471                    }
    472472
    473473                    if (   RT_SUCCESS(rc)
    474                         && uNextMsg == HOST_DND_HG_SND_FILE_HDR)
     474                        && uNextMsg == HOST_DND_FN_HG_SND_FILE_HDR)
    475475                    {
    476476                        char *pszPathAbs = RTPathJoinA(pszDropDir, szPathName);
    … …  
    520520
    521521                    if (   RT_SUCCESS(rc)
    522                         && uNextMsg == HOST_DND_HG_SND_FILE_DATA
     522                        && uNextMsg == HOST_DND_FN_HG_SND_FILE_DATA
    523523                        && cbChunkRead)
    524524                    {
    … …  
    527527                        if (RT_SUCCESS(rc))
    528528                        {
    529                             LogFlowFunc(("HOST_DND_HG_SND_FILE_DATA: "
     529                            LogFlowFunc(("HOST_DND_FN_HG_SND_FILE_DATA: "
    530530                                         "cbChunkRead=%RU32, cbChunkWritten=%RU32, cbFileWritten=%RU64 cbFileSize=%RU64\n",
    531531                                         cbChunkRead, cbChunkWritten, cbFileWritten + cbChunkWritten, cbFileSize));
    … …  
    557557                    break;
    558558                }
    559                 case HOST_DND_CANCEL:
     559                case HOST_DND_FN_CANCEL:
    560560                {
    561561                    rc = vbglR3DnDHGRecvCancel(pCtx);
    … …  
    623623/**
    624624 * Host -> Guest
    625  * Utility function to receive the HOST_DND_HG_SND_DATA message from the host.
     625 * Utility function to receive the HOST_DND_FN_HG_SND_DATA message from the host.
    626626 *
    627627 * @returns IPRT status code.
    … …  
    644644
    645645    HGCMMsgHGSendData Msg;
    646     VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_HG_SND_DATA, 5);
     646    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_FN_HG_SND_DATA, 5);
    647647    Msg.u.v3.uContext.SetUInt32(0);
    648648    Msg.u.v3.pvData.SetPtr(pvData, cbData);
    … …  
    674674/**
    675675 * Host -> Guest
    676  * Utility function to receive the HOST_DND_HG_SND_DATA_HDR message from the host.
     676 * Utility function to receive the HOST_DND_FN_HG_SND_DATA_HDR message from the host.
    677677 *
    678678 * @returns IPRT status code.
    … …  
    688688
    689689    HGCMMsgHGSendDataHdr Msg;
    690     VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_HG_SND_DATA_HDR, 12);
     690    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_FN_HG_SND_DATA_HDR, 12);
    691691    Msg.uContext.SetUInt32(0);
    692692    Msg.uFlags.SetUInt32(0);
    … …  
    909909/**
    910910 * Guest -> Host
    911  * Utility function to receive the HOST_DND_GH_REQ_PENDING message from the host.
     911 * Utility function to receive the HOST_DND_FN_GH_REQ_PENDING message from the host.
    912912 *
    913913 * @returns IPRT status code.
    … …  
    921921
    922922    HGCMMsgGHReqPending Msg;
    923     VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_GH_REQ_PENDING, 2);
     923    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_FN_GH_REQ_PENDING, 2);
    924924    /** @todo Context ID not used yet. */
    925925    Msg.u.v3.uContext.SetUInt32(0);
    … …  
    939939/**
    940940 * Guest -> Host
    941  * Utility function to receive the HOST_DND_GH_EVT_DROPPED message from the host.
     941 * Utility function to receive the HOST_DND_FN_GH_EVT_DROPPED message from the host.
    942942 *
    943943 * @returns IPRT status code.
    … …  
    962962
    963963    HGCMMsgGHDropped Msg;
    964     VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_GH_EVT_DROPPED, 4);
     964    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, HOST_DND_FN_GH_EVT_DROPPED, 4);
    965965    Msg.u.v3.uContext.SetUInt32(0);
    966966    Msg.u.v3.pvFormat.SetPtr(pszFormatTmp, cbFormatTmp);
    … …  
    10331033     */
    10341034    HGCMMsgConnect Msg;
    1035     VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_CONNECT, 3);
     1035    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_FN_CONNECT, 3);
    10361036    Msg.u.v3.uContext.SetUInt32(0);                /** @todo Context ID not used yet. */
    10371037    Msg.u.v3.uProtocol.SetUInt32(pCtx->uProtocolDeprecated); /* Deprecated since VBox 6.1.x. */
    … …  
    11031103            HGCMFunctionParameter   f64Features1;
    11041104        } Msg;
    1105         VBGL_HGCM_HDR_INIT(&Msg.Hdr, idClient, GUEST_DND_REPORT_FEATURES, 2);
     1105        VBGL_HGCM_HDR_INIT(&Msg.Hdr, idClient, GUEST_DND_FN_REPORT_FEATURES, 2);
    11061106        VbglHGCMParmUInt64Set(&Msg.f64Features0, fGuestFeatures);
    11071107        VbglHGCMParmUInt64Set(&Msg.f64Features1, VBOX_DND_GF_1_MUST_BE_ONE);
    … …  
    11701170        switch(uMsg)
    11711171        {
    1172             case HOST_DND_HG_EVT_ENTER:
     1172            case HOST_DND_FN_HG_EVT_ENTER:
    11731173            {
    11741174                rc = vbglR3DnDHGRecvAction(pCtx,
    … …  
    11851185                break;
    11861186            }
    1187             case HOST_DND_HG_EVT_MOVE:
     1187            case HOST_DND_FN_HG_EVT_MOVE:
    11881188            {
    11891189                rc = vbglR3DnDHGRecvAction(pCtx,
    … …  
    12001200                break;
    12011201            }
    1202             case HOST_DND_HG_EVT_DROPPED:
     1202            case HOST_DND_FN_HG_EVT_DROPPED:
    12031203            {
    12041204                rc = vbglR3DnDHGRecvAction(pCtx,
    … …  
    12151215                break;
    12161216            }
    1217             case HOST_DND_HG_EVT_LEAVE:
     1217            case HOST_DND_FN_HG_EVT_LEAVE:
    12181218            {
    12191219                rc = vbglR3DnDHGRecvLeave(pCtx);
    … …  
    12221222                break;
    12231223            }
    1224             case HOST_DND_HG_SND_DATA_HDR:
     1224            case HOST_DND_FN_HG_SND_DATA_HDR:
    12251225            {
    12261226                rc = vbglR3DnDHGRecvDataMain(pCtx, &pEvent->u.HG_Received.Meta);
    … …  
    12291229                break;
    12301230            }
    1231             case HOST_DND_HG_SND_DIR:
     1231            case HOST_DND_FN_HG_SND_DIR:
    12321232                RT_FALL_THROUGH();
    1233             case HOST_DND_HG_SND_FILE_HDR:
     1233            case HOST_DND_FN_HG_SND_FILE_HDR:
    12341234                RT_FALL_THROUGH();
    1235             case HOST_DND_HG_SND_FILE_DATA:
     1235            case HOST_DND_FN_HG_SND_FILE_DATA:
    12361236            {
    12371237                /*
    … …  
    12441244                break;
    12451245            }
    1246             case HOST_DND_CANCEL:
     1246            case HOST_DND_FN_CANCEL:
    12471247            {
    12481248                rc = vbglR3DnDHGRecvCancel(pCtx);
    … …  
    12521252            }
    12531253#ifdef VBOX_WITH_DRAG_AND_DROP_GH
    1254             case HOST_DND_GH_REQ_PENDING:
     1254            case HOST_DND_FN_GH_REQ_PENDING:
    12551255            {
    12561256                rc = vbglR3DnDGHRecvPending(pCtx, &pEvent->u.GH_IsPending.uScreenID);
    … …  
    12591259                break;
    12601260            }
    1261             case HOST_DND_GH_EVT_DROPPED:
     1261            case HOST_DND_FN_GH_EVT_DROPPED:
    12621262            {
    12631263                rc = vbglR3DnDGHRecvDropped(pCtx,
    … …  
    13591359
    13601360    HGCMMsgHGAck Msg;
    1361     VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_HG_ACK_OP, 2);
     1361    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_FN_HG_ACK_OP, 2);
    13621362    /** @todo Context ID not used yet. */
    13631363    Msg.u.v3.uContext.SetUInt32(0);
    … …  
    13851385
    13861386    HGCMMsgHGReqData Msg;
    1387     VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_HG_REQ_DATA, 3);
     1387    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_FN_HG_REQ_DATA, 3);
    13881388    /** @todo Context ID not used yet. */
    13891389    Msg.u.v3.uContext.SetUInt32(0);
    … …  
    14101410
    14111411    HGCMMsgHGProgress Msg;
    1412     VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_HG_EVT_PROGRESS, 4);
     1412    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_FN_HG_EVT_PROGRESS, 4);
    14131413    /** @todo Context ID not used yet. */
    14141414    Msg.u.v3.uContext.SetUInt32(0);
    … …  
    14451445
    14461446    HGCMMsgGHAckPending Msg;
    1447     VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_GH_ACK_PENDING, 5);
     1447    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_FN_GH_ACK_PENDING, 5);
    14481448    /** @todo Context ID not used yet. */
    14491449    Msg.u.v3.uContext.SetUInt32(0);
    … …  
    14751475
    14761476    HGCMMsgGHSendDataHdr MsgHdr;
    1477     VBGL_HGCM_HDR_INIT(&MsgHdr.hdr, pCtx->uClientID, GUEST_DND_GH_SND_DATA_HDR, 12);
     1477    VBGL_HGCM_HDR_INIT(&MsgHdr.hdr, pCtx->uClientID, GUEST_DND_FN_GH_SND_DATA_HDR, 12);
    14781478    MsgHdr.uContext.SetUInt32(0);                           /** @todo Not used yet. */
    14791479    MsgHdr.uFlags.SetUInt32(0);                             /** @todo Not used yet. */
    … …  
    14971497    {
    14981498        HGCMMsgGHSendData MsgData;
    1499         VBGL_HGCM_HDR_INIT(&MsgData.hdr, pCtx->uClientID, GUEST_DND_GH_SND_DATA, 5);
     1499        VBGL_HGCM_HDR_INIT(&MsgData.hdr, pCtx->uClientID, GUEST_DND_FN_GH_SND_DATA, 5);
    15001500        MsgData.u.v3.uContext.SetUInt32(0);      /** @todo Not used yet. */
    15011501        MsgData.u.v3.pvChecksum.SetPtr(NULL, 0); /** @todo Not used yet. */
    … …  
    15541554
    15551555    HGCMMsgGHSendDir Msg;
    1556     VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_GH_SND_DIR, 4);
     1556    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_FN_GH_SND_DIR, 4);
    15571557    /** @todo Context ID not used yet. */
    15581558    Msg.u.v3.uContext.SetUInt32(0);
    … …  
    16021602
    16031603    HGCMMsgGHSendFileHdr MsgHdr;
    1604     VBGL_HGCM_HDR_INIT(&MsgHdr.hdr, pCtx->uClientID, GUEST_DND_GH_SND_FILE_HDR, 6);
     1604    VBGL_HGCM_HDR_INIT(&MsgHdr.hdr, pCtx->uClientID, GUEST_DND_FN_GH_SND_FILE_HDR, 6);
    16051605    MsgHdr.uContext.SetUInt32(0);                                                    /* Context ID; unused at the moment. */
    16061606    MsgHdr.pvName.SetPtr((void *)pcszPath, (uint32_t)(cchPath + 1));                 /* Include termination. */
    … …  
    16201620         */
    16211621        HGCMMsgGHSendFileData Msg;
    1622         VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_GH_SND_FILE_DATA, 5);
     1622        VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_FN_GH_SND_FILE_DATA, 5);
    16231623        Msg.u.v3.uContext.SetUInt32(0);
    16241624        Msg.u.v3.pvChecksum.SetPtr(NULL, 0);
    … …  
    18651865
    18661866    HGCMMsgGHError Msg;
    1867     VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_GH_EVT_ERROR, 2);
     1867    VBGL_HGCM_HDR_INIT(&Msg.hdr, pCtx->uClientID, GUEST_DND_FN_GH_EVT_ERROR, 2);
    18681868    /** @todo Context ID not used yet. */
    18691869    Msg.u.v3.uContext.SetUInt32(0);

  • trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp

    r85566 r85745  
    31743174                        }
    31753175
    3176                         /* Note: After HOST_DND_HG_EVT_ENTER there immediately is a move
     3176                        /* Note: After HOST_DND_FN_HG_EVT_ENTER there immediately is a move
    31773177                         *       event, so fall through is intentional here. */
    31783178                        RT_FALL_THROUGH();
    … …  
    31993199                    }
    32003200
    3201                     /* Note: VbglR3DnDRecvNextMsg() will return HOST_DND_HG_SND_DATA_HDR when
     3201                    /* Note: VbglR3DnDRecvNextMsg() will return HOST_DND_FN_HG_SND_DATA_HDR when
    32023202                     *       the host has finished copying over all the data to the guest.
    32033203                     *

  • trunk/src/VBox/HostServices/DragAndDrop/VBoxDragAndDropSvc.cpp

    r85722 r85745  
    162162    if (m_SvcCtx.pfnHostCallback)
    163163    {
    164         int rc2 = m_SvcCtx.pfnHostCallback(m_SvcCtx.pvHostData, GUEST_DND_DISCONNECT, &data, sizeof(data));
     164        int rc2 = m_SvcCtx.pfnHostCallback(m_SvcCtx.pvHostData, GUEST_DND_FN_DISCONNECT, &data, sizeof(data));
    165165        if (RT_FAILURE(rc2))
    166166            LogFlowFunc(("Warning: Unable to notify host about client %RU32 disconnect, rc=%Rrc\n", m_idClient, rc2));
    … …  
    298298
    299299/**
    300  * Implements GUEST_DND_REPORT_FEATURES.
     300 * Implements GUEST_DND_FN_REPORT_FEATURES.
    301301 *
    302302 * @returns VBox status code.
    … …  
    344344
    345345/**
    346  * Implements GUEST_DND_QUERY_FEATURES.
     346 * Implements GUEST_DND_FN_QUERY_FEATURES.
    347347 *
    348348 * @returns VBox status code.
    … …  
    418418    switch (u32Function)
    419419    {
    420         case GUEST_DND_GET_NEXT_HOST_MSG:
     420        case GUEST_DND_FN_GET_NEXT_HOST_MSG:
    421421        {
    422422            if (modeGet() != VBOX_DRAG_AND_DROP_MODE_OFF)
    … …  
    431431
    432432        /* New since protocol v2. */
    433         case GUEST_DND_CONNECT:
     433        case GUEST_DND_FN_CONNECT:
    434434            RT_FALL_THROUGH();
    435435        /* New since VBox 6.1.x. */
    436         case GUEST_DND_REPORT_FEATURES:
     436        case GUEST_DND_FN_REPORT_FEATURES:
    437437            RT_FALL_THROUGH();
    438438        /* New since VBox 6.1.x. */
    439         case GUEST_DND_QUERY_FEATURES:
     439        case GUEST_DND_FN_QUERY_FEATURES:
    440440        {
    441441            /*
    … …  
    448448        }
    449449
    450         case GUEST_DND_HG_ACK_OP:
    451         case GUEST_DND_HG_REQ_DATA:
    452         case GUEST_DND_HG_EVT_PROGRESS:
     450        case GUEST_DND_FN_HG_ACK_OP:
     451        case GUEST_DND_FN_HG_REQ_DATA:
     452        case GUEST_DND_FN_HG_EVT_PROGRESS:
    453453        {
    454454            if (   modeGet() == VBOX_DRAG_AND_DROP_MODE_BIDIRECTIONAL
    … …  
    460460        }
    461461
    462         case GUEST_DND_GH_ACK_PENDING:
    463         case GUEST_DND_GH_SND_DATA_HDR:
    464         case GUEST_DND_GH_SND_DATA:
    465         case GUEST_DND_GH_SND_DIR:
    466         case GUEST_DND_GH_SND_FILE_HDR:
    467         case GUEST_DND_GH_SND_FILE_DATA:
    468         case GUEST_DND_GH_EVT_ERROR:
     462        case GUEST_DND_FN_GH_ACK_PENDING:
     463        case GUEST_DND_FN_GH_SND_DATA_HDR:
     464        case GUEST_DND_FN_GH_SND_DATA:
     465        case GUEST_DND_FN_GH_SND_DIR:
     466        case GUEST_DND_FN_GH_SND_FILE_HDR:
     467        case GUEST_DND_FN_GH_SND_FILE_DATA:
     468        case GUEST_DND_FN_GH_EVT_ERROR:
    469469        {
    470470#ifdef VBOX_WITH_DRAG_AND_DROP_GH
    … …  
    547547            /*
    548548             * Note: Older VBox versions with enabled DnD guest->host support (< 5.0)
    549              *       used the same message ID (300) for GUEST_DND_GET_NEXT_HOST_MSG and
    550              *       HOST_DND_GH_REQ_PENDING, which led this service returning
     549             *       used the same message ID (300) for GUEST_DND_FN_GET_NEXT_HOST_MSG and
     550             *       HOST_DND_FN_GH_REQ_PENDING, which led this service returning
    551551             *       VERR_INVALID_PARAMETER when the guest wanted to actually
    552              *       handle HOST_DND_GH_REQ_PENDING.
     552             *       handle HOST_DND_FN_GH_REQ_PENDING.
    553553             */
    554             case GUEST_DND_GET_NEXT_HOST_MSG:
    555             {
    556                 LogFlowFunc(("GUEST_DND_GET_NEXT_HOST_MSG\n"));
     554            case GUEST_DND_FN_GET_NEXT_HOST_MSG:
     555            {
     556                LogFlowFunc(("GUEST_DND_FN_GET_NEXT_HOST_MSG\n"));
    557557                if (cParms == 3)
    558558                {
    … …  
    599599                break;
    600600            }
    601             case GUEST_DND_CONNECT:
    602             {
    603                 LogFlowFunc(("GUEST_DND_CONNECT\n"));
     601            case GUEST_DND_FN_CONNECT:
     602            {
     603                LogFlowFunc(("GUEST_DND_FN_CONNECT\n"));
    604604
    605605                ASSERT_GUEST_BREAK(cParms >= 2);
    … …  
    635635                break;
    636636            }
    637             case GUEST_DND_REPORT_FEATURES:
    638             {
    639                 LogFlowFunc(("GUEST_DND_REPORT_FEATURES\n"));
     637            case GUEST_DND_FN_REPORT_FEATURES:
     638            {
     639                LogFlowFunc(("GUEST_DND_FN_REPORT_FEATURES\n"));
    640640                rc = clientReportFeatures(pClient, callHandle, cParms, paParms);
    641641                if (RT_SUCCESS(rc))
    … …  
    654654                break;
    655655            }
    656             case GUEST_DND_QUERY_FEATURES:
    657             {
    658                 LogFlowFunc(("GUEST_DND_QUERY_FEATURES"));
     656            case GUEST_DND_FN_QUERY_FEATURES:
     657            {
     658                LogFlowFunc(("GUEST_DND_FN_QUERY_FEATURES"));
    659659                rc = clientQueryFeatures(pClient, callHandle, cParms, paParms);
    660660                break;
    661661            }
    662             case GUEST_DND_HG_ACK_OP:
    663             {
    664                 LogFlowFunc(("GUEST_DND_HG_ACK_OP\n"));
     662            case GUEST_DND_FN_HG_ACK_OP:
     663            {
     664                LogFlowFunc(("GUEST_DND_FN_HG_ACK_OP\n"));
    665665
    666666                ASSERT_GUEST_BREAK(cParms >= 2);
    … …  
    677677                break;
    678678            }
    679             case GUEST_DND_HG_REQ_DATA:
    680             {
    681                 LogFlowFunc(("GUEST_DND_HG_REQ_DATA\n"));
     679            case GUEST_DND_FN_HG_REQ_DATA:
     680            {
     681                LogFlowFunc(("GUEST_DND_FN_HG_REQ_DATA\n"));
    682682
    683683                VBOXDNDCBHGREQDATADATA data;
    … …  
    711711                break;
    712712            }
    713             case GUEST_DND_HG_EVT_PROGRESS:
    714             {
    715                 LogFlowFunc(("GUEST_DND_HG_EVT_PROGRESS\n"));
     713            case GUEST_DND_FN_HG_EVT_PROGRESS:
     714            {
     715                LogFlowFunc(("GUEST_DND_FN_HG_EVT_PROGRESS\n"));
    716716
    717717                ASSERT_GUEST_BREAK(cParms >= 3);
    … …  
    733733            }
    734734#ifdef VBOX_WITH_DRAG_AND_DROP_GH
    735             case GUEST_DND_GH_ACK_PENDING:
    736             {
    737                 LogFlowFunc(("GUEST_DND_GH_ACK_PENDING\n"));
     735            case GUEST_DND_FN_GH_ACK_PENDING:
     736            {
     737                LogFlowFunc(("GUEST_DND_FN_GH_ACK_PENDING\n"));
    738738
    739739                VBOXDNDCBGHACKPENDINGDATA data;
    … …  
    775775            }
    776776            /* New since protocol v3. */
    777             case GUEST_DND_GH_SND_DATA_HDR:
    778             {
    779                 LogFlowFunc(("GUEST_DND_GH_SND_DATA_HDR\n"));
     777            case GUEST_DND_FN_GH_SND_DATA_HDR:
     778            {
     779                LogFlowFunc(("GUEST_DND_FN_GH_SND_DATA_HDR\n"));
    780780
    781781                ASSERT_GUEST_BREAK(cParms == 12);
    … …  
    811811                break;
    812812            }
    813             case GUEST_DND_GH_SND_DATA:
    814             {
    815                 LogFlowFunc(("GUEST_DND_GH_SND_DATA\n"));
     813            case GUEST_DND_FN_GH_SND_DATA:
     814            {
     815                LogFlowFunc(("GUEST_DND_FN_GH_SND_DATA\n"));
    816816
    817817                switch (pClient->uProtocolVerDeprecated)
    … …  
    857857                break;
    858858            }
    859             case GUEST_DND_GH_SND_DIR:
    860             {
    861                 LogFlowFunc(("GUEST_DND_GH_SND_DIR\n"));
     859            case GUEST_DND_FN_GH_SND_DIR:
     860            {
     861                LogFlowFunc(("GUEST_DND_FN_GH_SND_DIR\n"));
    862862
    863863                ASSERT_GUEST_BREAK(cParms >= 3);
    … …  
    878878            }
    879879            /* New since protocol v2 (>= VBox 5.0). */
    880             case GUEST_DND_GH_SND_FILE_HDR:
    881             {
    882                 LogFlowFunc(("GUEST_DND_GH_SND_FILE_HDR\n"));
     880            case GUEST_DND_FN_GH_SND_FILE_HDR:
     881            {
     882                LogFlowFunc(("GUEST_DND_FN_GH_SND_FILE_HDR\n"));
    883883
    884884                ASSERT_GUEST_BREAK(cParms == 6);
    … …  
    902902                break;
    903903            }
    904             case GUEST_DND_GH_SND_FILE_DATA:
    905             {
    906                 LogFlowFunc(("GUEST_DND_GH_SND_FILE_DATA\n"));
     904            case GUEST_DND_FN_GH_SND_FILE_DATA:
     905            {
     906                LogFlowFunc(("GUEST_DND_FN_GH_SND_FILE_DATA\n"));
    907907
    908908                switch (pClient->uProtocolVerDeprecated)
    … …  
    969969                break;
    970970            }
    971             case GUEST_DND_GH_EVT_ERROR:
    972             {
    973                 LogFlowFunc(("GUEST_DND_GH_EVT_ERROR\n"));
     971            case GUEST_DND_FN_GH_EVT_ERROR:
     972            {
     973                LogFlowFunc(("GUEST_DND_FN_GH_EVT_ERROR\n"));
    974974
    975975                ASSERT_GUEST_BREAK(cParms >= 1);
    … …  
    10741074    switch (u32Function)
    10751075    {
    1076         case HOST_DND_SET_MODE:
     1076        case HOST_DND_FN_SET_MODE:
    10771077        {
    10781078            if (cParms != 1)
    … …  
    10851085        }
    10861086
    1087         case HOST_DND_CANCEL:
     1087        case HOST_DND_FN_CANCEL:
    10881088        {
    10891089            LogFlowFunc(("Cancelling all waiting clients ...\n"));
    … …  
    11121112                AssertPtr(pClient);
    11131113
    1114                 int rc2 = pClient->SetDeferredMsgInfo(HOST_DND_CANCEL,
     1114                int rc2 = pClient->SetDeferredMsgInfo(HOST_DND_FN_CANCEL,
    11151115                                                      /* Protocol v3+ also contains the context ID. */
    11161116                                                      pClient->uProtocolVerDeprecated >= 3 ? 1 : 0);
    … …  
    11281128        }
    11291129
    1130         case HOST_DND_HG_EVT_ENTER:
     1130        case HOST_DND_FN_HG_EVT_ENTER:
    11311131        {
    11321132            /* Reset the message queue as a new DnD operation just began. */
    … …  
    12051205            if (RT_SUCCESS(rcNext))
    12061206            {
    1207                 if (uMsgClient == GUEST_DND_GET_NEXT_HOST_MSG)
     1207                if (uMsgClient == GUEST_DND_FN_GET_NEXT_HOST_MSG)
    12081208                {
    12091209                    rc = pClient->SetDeferredMsgInfo(uMsgNext, cParmsNext);
    … …  
    12511251    if (pSelf->m_SvcCtx.pfnHostCallback)
    12521252    {
    1253         LogFlowFunc(("GUEST_DND_HG_EVT_PROGRESS: uStatus=%RU32, uPercentage=%RU32, rc=%Rrc\n",
     1253        LogFlowFunc(("GUEST_DND_FN_HG_EVT_PROGRESS: uStatus=%RU32, uPercentage=%RU32, rc=%Rrc\n",
    12541254                     uStatus, uPercentage, rc));
    12551255
    … …  
    12611261
    12621262        return pSelf->m_SvcCtx.pfnHostCallback(pSelf->m_SvcCtx.pvHostData,
    1263                                                GUEST_DND_HG_EVT_PROGRESS,
     1263                                               GUEST_DND_FN_HG_EVT_PROGRESS,
    12641264                                               &data, sizeof(data));
    12651265    }

  • trunk/src/VBox/HostServices/DragAndDrop/dndmanager.h

    r85121 r85745  
    6969    DnDHGCancelMessage(void)
    7070    {
    71         int rc2 = initData(DragAndDropSvc::HOST_DND_CANCEL,
     71        int rc2 = initData(DragAndDropSvc::HOST_DND_FN_CANCEL,
    7272                           0 /* cParms */, 0 /* aParms */);
    7373        AssertRC(rc2);

  • trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

    r85309 r85745  
    92349234
    92359235    int rc = pVMMDev->hgcmHostCall("VBoxDragAndDropSvc",
    9236                                    DragAndDropSvc::HOST_DND_SET_MODE, 1 /* cParms */, &parm);
     9236                                   DragAndDropSvc::HOST_DND_FN_SET_MODE, 1 /* cParms */, &parm);
    92379237    if (RT_FAILURE(rc))
    92389238        LogRel(("Error changing drag and drop mode: %Rrc\n", rc));

  • trunk/src/VBox/Main/src-client/GuestDnDPrivate.cpp

    r85744 r85745  
    527527    switch (u32Function)
    528528    {
    529         case DragAndDropSvc::GUEST_DND_CONNECT:
     529        case DragAndDropSvc::GUEST_DND_FN_CONNECT:
    530530        {
    531531            DragAndDropSvc::PVBOXDNDCBCONNECTDATA pCBData = reinterpret_cast<DragAndDropSvc::PVBOXDNDCBCONNECTDATA>(pvParms);
    … …  
    543543        }
    544544
    545         case DragAndDropSvc::GUEST_DND_REPORT_FEATURES:
     545        case DragAndDropSvc::GUEST_DND_FN_REPORT_FEATURES:
    546546        {
    547547            DragAndDropSvc::PVBOXDNDCBREPORTFEATURESDATA pCBData = reinterpret_cast<DragAndDropSvc::PVBOXDNDCBREPORTFEATURESDATA>(pvParms);
    … …  
    558558        }
    559559
    560         case DragAndDropSvc::GUEST_DND_DISCONNECT:
     560        case DragAndDropSvc::GUEST_DND_FN_DISCONNECT:
    561561        {
    562562            LogThisFunc(("Client disconnected\n"));
    … …  
    565565        }
    566566
    567         case DragAndDropSvc::GUEST_DND_HG_ACK_OP:
     567        case DragAndDropSvc::GUEST_DND_FN_HG_ACK_OP:
    568568        {
    569569            DragAndDropSvc::PVBOXDNDCBHGACKOPDATA pCBData = reinterpret_cast<DragAndDropSvc::PVBOXDNDCBHGACKOPDATA>(pvParms);
    … …  
    577577        }
    578578
    579         case DragAndDropSvc::GUEST_DND_HG_REQ_DATA:
     579        case DragAndDropSvc::GUEST_DND_FN_HG_REQ_DATA:
    580580        {
    581581            DragAndDropSvc::PVBOXDNDCBHGREQDATADATA pCBData = reinterpret_cast<DragAndDropSvc::PVBOXDNDCBHGREQDATADATA>(pvParms);
    … …  
    606606        }
    607607
    608         case DragAndDropSvc::GUEST_DND_HG_EVT_PROGRESS:
     608        case DragAndDropSvc::GUEST_DND_FN_HG_EVT_PROGRESS:
    609609        {
    610610            DragAndDropSvc::PVBOXDNDCBHGEVTPROGRESSDATA pCBData =
    … …  
    620620        }
    621621#ifdef VBOX_WITH_DRAG_AND_DROP_GH
    622         case DragAndDropSvc::GUEST_DND_GH_ACK_PENDING:
     622        case DragAndDropSvc::GUEST_DND_FN_GH_ACK_PENDING:
    623623        {
    624624            DragAndDropSvc::PVBOXDNDCBGHACKPENDINGDATA pCBData =
    … …  
    13191319{
    13201320    GuestDnDMsg Msg;
    1321     Msg.setType(HOST_DND_CANCEL);
     1321    Msg.setType(HOST_DND_FN_CANCEL);
    13221322    if (m_pState->m_uProtocolVersion >= 3)
    13231323        Msg.appendUInt32(0); /** @todo ContextID not used yet. */

  • trunk/src/VBox/Main/src-client/GuestDnDSourceImpl.cpp

    r85744 r85745  
    275275
    276276    GuestDnDMsg Msg;
    277     Msg.setType(HOST_DND_GH_REQ_PENDING);
     277    Msg.setType(HOST_DND_FN_GH_REQ_PENDING);
    278278    if (m_pState->m_uProtocolVersion >= 3)
    279279        Msg.appendUInt32(0); /** @todo ContextID not used yet. */
    … …  
    11271127     * Register callbacks.
    11281128     */
    1129     REGISTER_CALLBACK(GUEST_DND_CONNECT);
    1130     REGISTER_CALLBACK(GUEST_DND_DISCONNECT);
    1131     REGISTER_CALLBACK(GUEST_DND_GH_EVT_ERROR);
     1129    REGISTER_CALLBACK(GUEST_DND_FN_CONNECT);
     1130    REGISTER_CALLBACK(GUEST_DND_FN_DISCONNECT);
     1131    REGISTER_CALLBACK(GUEST_DND_FN_GH_EVT_ERROR);
    11321132    if (m_pState->m_uProtocolVersion >= 3)
    1133         REGISTER_CALLBACK(GUEST_DND_GH_SND_DATA_HDR);
    1134     REGISTER_CALLBACK(GUEST_DND_GH_SND_DATA);
     1133        REGISTER_CALLBACK(GUEST_DND_FN_GH_SND_DATA_HDR);
     1134    REGISTER_CALLBACK(GUEST_DND_FN_GH_SND_DATA);
    11351135
    11361136    do
    … …  
    11401140         */
    11411141        GuestDnDMsg Msg;
    1142         Msg.setType(HOST_DND_GH_EVT_DROPPED);
     1142        Msg.setType(HOST_DND_FN_GH_EVT_DROPPED);
    11431143        if (m_pState->m_uProtocolVersion >= 3)
    11441144            Msg.appendUInt32(0); /** @todo ContextID not used yet. */
    … …  
    11621162     * Unregister callbacks.
    11631163     */
    1164     UNREGISTER_CALLBACK(GUEST_DND_CONNECT);
    1165     UNREGISTER_CALLBACK(GUEST_DND_DISCONNECT);
    1166     UNREGISTER_CALLBACK(GUEST_DND_GH_EVT_ERROR);
     1164    UNREGISTER_CALLBACK(GUEST_DND_FN_CONNECT);
     1165    UNREGISTER_CALLBACK(GUEST_DND_FN_DISCONNECT);
     1166    UNREGISTER_CALLBACK(GUEST_DND_FN_GH_EVT_ERROR);
    11671167    if (m_pState->m_uProtocolVersion >= 3)
    1168         UNREGISTER_CALLBACK(GUEST_DND_GH_SND_DATA_HDR);
    1169     UNREGISTER_CALLBACK(GUEST_DND_GH_SND_DATA);
     1168        UNREGISTER_CALLBACK(GUEST_DND_FN_GH_SND_DATA_HDR);
     1169    UNREGISTER_CALLBACK(GUEST_DND_FN_GH_SND_DATA);
    11701170
    11711171#undef REGISTER_CALLBACK
    … …  
    12401240     */
    12411241    /* Guest callbacks. */
    1242     REGISTER_CALLBACK(GUEST_DND_CONNECT);
    1243     REGISTER_CALLBACK(GUEST_DND_DISCONNECT);
    1244     REGISTER_CALLBACK(GUEST_DND_GH_EVT_ERROR);
     1242    REGISTER_CALLBACK(GUEST_DND_FN_CONNECT);
     1243    REGISTER_CALLBACK(GUEST_DND_FN_DISCONNECT);
     1244    REGISTER_CALLBACK(GUEST_DND_FN_GH_EVT_ERROR);
    12451245    if (m_pState->m_uProtocolVersion >= 3)
    1246         REGISTER_CALLBACK(GUEST_DND_GH_SND_DATA_HDR);
    1247     REGISTER_CALLBACK(GUEST_DND_GH_SND_DATA);
    1248     REGISTER_CALLBACK(GUEST_DND_GH_SND_DIR);
     1246        REGISTER_CALLBACK(GUEST_DND_FN_GH_SND_DATA_HDR);
     1247    REGISTER_CALLBACK(GUEST_DND_FN_GH_SND_DATA);
     1248    REGISTER_CALLBACK(GUEST_DND_FN_GH_SND_DIR);
    12491249    if (m_pState->m_uProtocolVersion >= 2)
    1250         REGISTER_CALLBACK(GUEST_DND_GH_SND_FILE_HDR);
    1251     REGISTER_CALLBACK(GUEST_DND_GH_SND_FILE_DATA);
     1250        REGISTER_CALLBACK(GUEST_DND_FN_GH_SND_FILE_HDR);
     1251    REGISTER_CALLBACK(GUEST_DND_FN_GH_SND_FILE_DATA);
    12521252
    12531253    const PDNDDROPPEDFILES pDF = &pCtx->Transfer.DroppedFiles;
    … …  
    12671267         */
    12681268        GuestDnDMsg Msg;
    1269         Msg.setType(HOST_DND_GH_EVT_DROPPED);
     1269        Msg.setType(HOST_DND_FN_GH_EVT_DROPPED);
    12701270        if (m_pState->m_uProtocolVersion >= 3)
    12711271            Msg.appendUInt32(0); /** @todo ContextID not used yet. */
    … …  
    12931293     * Unregister callbacks.
    12941294     */
    1295     UNREGISTER_CALLBACK(GUEST_DND_CONNECT);
    1296     UNREGISTER_CALLBACK(GUEST_DND_DISCONNECT);
    1297     UNREGISTER_CALLBACK(GUEST_DND_GH_EVT_ERROR);
    1298     UNREGISTER_CALLBACK(GUEST_DND_GH_SND_DATA_HDR);
    1299     UNREGISTER_CALLBACK(GUEST_DND_GH_SND_DATA);
    1300     UNREGISTER_CALLBACK(GUEST_DND_GH_SND_DIR);
    1301     UNREGISTER_CALLBACK(GUEST_DND_GH_SND_FILE_HDR);
    1302     UNREGISTER_CALLBACK(GUEST_DND_GH_SND_FILE_DATA);
     1295    UNREGISTER_CALLBACK(GUEST_DND_FN_CONNECT);
     1296    UNREGISTER_CALLBACK(GUEST_DND_FN_DISCONNECT);
     1297    UNREGISTER_CALLBACK(GUEST_DND_FN_GH_EVT_ERROR);
     1298    UNREGISTER_CALLBACK(GUEST_DND_FN_GH_SND_DATA_HDR);
     1299    UNREGISTER_CALLBACK(GUEST_DND_FN_GH_SND_DATA);
     1300    UNREGISTER_CALLBACK(GUEST_DND_FN_GH_SND_DIR);
     1301    UNREGISTER_CALLBACK(GUEST_DND_FN_GH_SND_FILE_HDR);
     1302    UNREGISTER_CALLBACK(GUEST_DND_FN_GH_SND_FILE_DATA);
    13031303
    13041304#undef REGISTER_CALLBACK
    … …  
    13691369    switch (uMsg)
    13701370    {
    1371         case GUEST_DND_CONNECT:
     1371        case GUEST_DND_FN_CONNECT:
    13721372            /* Nothing to do here (yet). */
    13731373            break;
    13741374
    1375         case GUEST_DND_DISCONNECT:
     1375        case GUEST_DND_FN_DISCONNECT:
    13761376            rc = VERR_CANCELLED;
    13771377            break;
    13781378
    13791379#ifdef VBOX_WITH_DRAG_AND_DROP_GH
    1380         case GUEST_DND_GH_SND_DATA_HDR:
     1380        case GUEST_DND_FN_GH_SND_DATA_HDR:
    13811381        {
    13821382            PVBOXDNDCBSNDDATAHDRDATA pCBData = reinterpret_cast<PVBOXDNDCBSNDDATAHDRDATA>(pvParms);
    … …  
    13881388            break;
    13891389        }
    1390         case GUEST_DND_GH_SND_DATA:
     1390        case GUEST_DND_FN_GH_SND_DATA:
    13911391        {
    13921392            PVBOXDNDCBSNDDATADATA pCBData = reinterpret_cast<PVBOXDNDCBSNDDATADATA>(pvParms);
    … …  
    13981398            break;
    13991399        }
    1400         case GUEST_DND_GH_EVT_ERROR:
     1400        case GUEST_DND_FN_GH_EVT_ERROR:
    14011401        {
    14021402            PVBOXDNDCBEVTERRORDATA pCBData = reinterpret_cast<PVBOXDNDCBEVTERRORDATA>(pvParms);
    … …  
    15071507    switch (uMsg)
    15081508    {
    1509         case GUEST_DND_CONNECT:
     1509        case GUEST_DND_FN_CONNECT:
    15101510            /* Nothing to do here (yet). */
    15111511            break;
    15121512
    1513         case GUEST_DND_DISCONNECT:
     1513        case GUEST_DND_FN_DISCONNECT:
    15141514            rc = VERR_CANCELLED;
    15151515            break;
    15161516
    15171517#ifdef VBOX_WITH_DRAG_AND_DROP_GH
    1518         case GUEST_DND_GH_SND_DATA_HDR:
     1518        case GUEST_DND_FN_GH_SND_DATA_HDR:
    15191519        {
    15201520            PVBOXDNDCBSNDDATAHDRDATA pCBData = reinterpret_cast<PVBOXDNDCBSNDDATAHDRDATA>(pvParms);
    … …  
    15261526            break;
    15271527        }
    1528         case GUEST_DND_GH_SND_DATA:
     1528        case GUEST_DND_FN_GH_SND_DATA:
    15291529        {
    15301530            PVBOXDNDCBSNDDATADATA pCBData = reinterpret_cast<PVBOXDNDCBSNDDATADATA>(pvParms);
    … …  
    15361536            break;
    15371537        }
    1538         case GUEST_DND_GH_SND_DIR:
     1538        case GUEST_DND_FN_GH_SND_DIR:
    15391539        {
    15401540            PVBOXDNDCBSNDDIRDATA pCBData = reinterpret_cast<PVBOXDNDCBSNDDIRDATA>(pvParms);
    … …  
    15461546            break;
    15471547        }
    1548         case GUEST_DND_GH_SND_FILE_HDR:
     1548        case GUEST_DND_FN_GH_SND_FILE_HDR:
    15491549        {
    15501550            PVBOXDNDCBSNDFILEHDRDATA pCBData = reinterpret_cast<PVBOXDNDCBSNDFILEHDRDATA>(pvParms);
    … …  
    15571557            break;
    15581558        }
    1559         case GUEST_DND_GH_SND_FILE_DATA:
     1559        case GUEST_DND_FN_GH_SND_FILE_DATA:
    15601560        {
    15611561            PVBOXDNDCBSNDFILEDATADATA pCBData = reinterpret_cast<PVBOXDNDCBSNDFILEDATADATA>(pvParms);
    … …  
    15821582            break;
    15831583        }
    1584         case GUEST_DND_GH_EVT_ERROR:
     1584        case GUEST_DND_FN_GH_EVT_ERROR:
    15851585        {
    15861586            PVBOXDNDCBEVTERRORDATA pCBData = reinterpret_cast<PVBOXDNDCBEVTERRORDATA>(pvParms);

  • trunk/src/VBox/Main/src-client/GuestDnDTargetImpl.cpp

    r85744 r85745  
    315315    {
    316316        GuestDnDMsg Msg;
    317         Msg.setType(HOST_DND_HG_EVT_ENTER);
     317        Msg.setType(HOST_DND_FN_HG_EVT_ENTER);
    318318        if (m_pState->m_uProtocolVersion >= 3)
    319319            Msg.appendUInt32(0); /** @todo ContextID not used yet. */
    … …  
    392392    {
    393393        GuestDnDMsg Msg;
    394         Msg.setType(HOST_DND_HG_EVT_MOVE);
     394        Msg.setType(HOST_DND_FN_HG_EVT_MOVE);
    395395        if (m_pState->m_uProtocolVersion >= 3)
    396396            Msg.appendUInt32(0); /** @todo ContextID not used yet. */
    … …  
    439439
    440440    GuestDnDMsg Msg;
    441     Msg.setType(HOST_DND_HG_EVT_LEAVE);
     441    Msg.setType(HOST_DND_FN_HG_EVT_LEAVE);
    442442    if (m_pState->m_uProtocolVersion >= 3)
    443443        Msg.appendUInt32(0); /** @todo ContextID not used yet. */
    … …  
    515515    {
    516516        GuestDnDMsg Msg;
    517         Msg.setType(HOST_DND_HG_EVT_DROPPED);
     517        Msg.setType(HOST_DND_FN_HG_EVT_DROPPED);
    518518        if (m_pState->m_uProtocolVersion >= 3)
    519519            Msg.appendUInt32(0); /** @todo ContextID not used yet. */
    … …  
    851851    {
    852852        GuestDnDMsg Msg;
    853         Msg.setType(HOST_DND_HG_SND_DATA);
     853        Msg.setType(HOST_DND_FN_HG_SND_DATA);
    854854
    855855        if (m_pState->m_uProtocolVersion < 3)
    … …  
    905905
    906906    GuestDnDMsg Msg;
    907     Msg.setType(HOST_DND_HG_SND_DATA_HDR);
     907    Msg.setType(HOST_DND_FN_HG_SND_DATA_HDR);
    908908
    909909    LogRel2(("DnD: Sending meta data header to guest (%RU64 bytes total data, %RU32 bytes meta data, %RU64 objects)\n",
    … …  
    949949    LogRel2(("DnD: Transferring host directory '%s' to guest\n", DnDTransferObjectGetSourcePath(pObj)));
    950950
    951     pMsg->setType(HOST_DND_HG_SND_DIR);
     951    pMsg->setType(HOST_DND_FN_HG_SND_DIR);
    952952    if (m_pState->m_uProtocolVersion >= 3)
    953953        pMsg->appendUInt32(0); /** @todo ContextID not used yet. */
    … …  
    10101010                 * The just registered callback will be called by the guest afterwards.
    10111011                 */
    1012                 pMsg->setType(HOST_DND_HG_SND_FILE_HDR);
     1012                pMsg->setType(HOST_DND_FN_HG_SND_FILE_HDR);
    10131013                pMsg->appendUInt32(0); /** @todo ContextID not used yet. */
    10141014                pMsg->appendString(pcszDstPath);                    /* pvName */
    … …  
    10721072
    10731073    /* Set the message type. */
    1074     pMsg->setType(HOST_DND_HG_SND_FILE_DATA);
     1074    pMsg->setType(HOST_DND_FN_HG_SND_FILE_DATA);
    10751075
    10761076    const char *pcszSrcPath = DnDTransferObjectGetSourcePath(pObj);
    … …  
    10781078
    10791079    /* Protocol version 1 sends the file path *every* time with a new file chunk.
    1080      * In protocol version 2 we only do this once with HOST_DND_HG_SND_FILE_HDR. */
     1080     * In protocol version 2 we only do this once with HOST_DND_FN_HG_SND_FILE_HDR. */
    10811081    if (m_pState->m_uProtocolVersion <= 1)
    10821082    {
    … …  
    11681168    switch (uMsg)
    11691169    {
    1170         case GUEST_DND_CONNECT:
     1170        case GUEST_DND_FN_CONNECT:
    11711171            /* Nothing to do here (yet). */
    11721172            break;
    11731173
    1174         case GUEST_DND_DISCONNECT:
     1174        case GUEST_DND_FN_DISCONNECT:
    11751175            rc = VERR_CANCELLED;
    11761176            break;
    11771177
    1178         case GUEST_DND_GET_NEXT_HOST_MSG:
     1178        case GUEST_DND_FN_GET_NEXT_HOST_MSG:
    11791179        {
    11801180            PVBOXDNDCBHGGETNEXTHOSTMSG pCBData = reinterpret_cast<PVBOXDNDCBHGGETNEXTHOSTMSG>(pvParms);
    … …  
    11971197                    if (RT_SUCCESS(rc)) /* Return message type & required parameter count to the guest. */
    11981198                    {
    1199                         LogFlowFunc(("GUEST_DND_GET_NEXT_HOST_MSG -> %RU32 (%RU32 params)\n", pMsg->getType(), pMsg->getCount()));
     1199                        LogFlowFunc(("GUEST_DND_FN_GET_NEXT_HOST_MSG -> %RU32 (%RU32 params)\n", pMsg->getType(), pMsg->getCount()));
    12001200                        pCBData->uMsg   = pMsg->getType();
    12011201                        pCBData->cParms = pMsg->getCount();
    … …  
    12161216            break;
    12171217        }
    1218         case GUEST_DND_GH_EVT_ERROR:
     1218        case GUEST_DND_FN_GH_EVT_ERROR:
    12191219        {
    12201220            PVBOXDNDCBEVTERRORDATA pCBData = reinterpret_cast<PVBOXDNDCBEVTERRORDATA>(pvParms);
    … …  
    12401240            break;
    12411241        }
    1242         case HOST_DND_HG_SND_DIR:
    1243         case HOST_DND_HG_SND_FILE_HDR:
    1244         case HOST_DND_HG_SND_FILE_DATA:
     1242        case HOST_DND_FN_HG_SND_DIR:
     1243        case HOST_DND_FN_HG_SND_FILE_HDR:
     1244        case HOST_DND_FN_HG_SND_FILE_DATA:
    12451245        {
    12461246            PVBOXDNDCBHGGETNEXTHOSTMSGDATA pCBData
    … …  
    14001400     */
    14011401    /* Guest callbacks. */
    1402     REGISTER_CALLBACK(GUEST_DND_CONNECT);
    1403     REGISTER_CALLBACK(GUEST_DND_DISCONNECT);
    1404     REGISTER_CALLBACK(GUEST_DND_GET_NEXT_HOST_MSG);
    1405     REGISTER_CALLBACK(GUEST_DND_GH_EVT_ERROR);
     1402    REGISTER_CALLBACK(GUEST_DND_FN_CONNECT);
     1403    REGISTER_CALLBACK(GUEST_DND_FN_DISCONNECT);
     1404    REGISTER_CALLBACK(GUEST_DND_FN_GET_NEXT_HOST_MSG);
     1405    REGISTER_CALLBACK(GUEST_DND_FN_GH_EVT_ERROR);
    14061406    /* Host callbacks. */
    1407     REGISTER_CALLBACK(HOST_DND_HG_SND_DIR);
     1407    REGISTER_CALLBACK(HOST_DND_FN_HG_SND_DIR);
    14081408    if (m_pState->m_uProtocolVersion >= 2)
    1409         REGISTER_CALLBACK(HOST_DND_HG_SND_FILE_HDR);
    1410     REGISTER_CALLBACK(HOST_DND_HG_SND_FILE_DATA);
     1409        REGISTER_CALLBACK(HOST_DND_FN_HG_SND_FILE_HDR);
     1410    REGISTER_CALLBACK(HOST_DND_FN_HG_SND_FILE_DATA);
    14111411
    14121412    do
    … …  
    14951495     */
    14961496    /* Guest callbacks. */
    1497     UNREGISTER_CALLBACK(GUEST_DND_CONNECT);
    1498     UNREGISTER_CALLBACK(GUEST_DND_DISCONNECT);
    1499     UNREGISTER_CALLBACK(GUEST_DND_GET_NEXT_HOST_MSG);
    1500     UNREGISTER_CALLBACK(GUEST_DND_GH_EVT_ERROR);
     1497    UNREGISTER_CALLBACK(GUEST_DND_FN_CONNECT);
     1498    UNREGISTER_CALLBACK(GUEST_DND_FN_DISCONNECT);
     1499    UNREGISTER_CALLBACK(GUEST_DND_FN_GET_NEXT_HOST_MSG);
     1500    UNREGISTER_CALLBACK(GUEST_DND_FN_GH_EVT_ERROR);
    15011501    /* Host callbacks. */
    1502     UNREGISTER_CALLBACK(HOST_DND_HG_SND_DIR);
     1502    UNREGISTER_CALLBACK(HOST_DND_FN_HG_SND_DIR);
    15031503    if (m_pState->m_uProtocolVersion >= 2)
    1504         UNREGISTER_CALLBACK(HOST_DND_HG_SND_FILE_HDR);
    1505     UNREGISTER_CALLBACK(HOST_DND_HG_SND_FILE_DATA);
     1504        UNREGISTER_CALLBACK(HOST_DND_FN_HG_SND_FILE_HDR);
     1505    UNREGISTER_CALLBACK(HOST_DND_FN_HG_SND_FILE_DATA);
    15061506
    15071507#undef REGISTER_CALLBACK
    … …  
    16061606
    16071607    /** @todo At the moment we only allow sending up to 64K raw data.
    1608      *        For protocol v1+v2: Fix this by using HOST_DND_HG_SND_MORE_DATA.
    1609      *        For protocol v3   : Send another HOST_DND_HG_SND_DATA message. */
     1608     *        For protocol v1+v2: Fix this by using HOST_DND_FN_HG_SND_MORE_DATA.
     1609     *        For protocol v3   : Send another HOST_DND_FN_HG_SND_DATA message. */
    16101610    if (!pCtx->Meta.cbData)
    16111611        return VINF_SUCCESS;
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette