VirtualBox

Changeset 85018 in vbox for trunk/src/VBox/Main


Ignore:
Timestamp:
Jul 1, 2020 10:42:45 AM (5 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
138919
Message:

DnD/Main: Renaming internal send/receive data contexts to emphasize that these actually are classes and not POD types.

Location:
trunk/src/VBox/Main
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Main/include/GuestDnDPrivate.h

    r82968 r85018  
    762762 * Context structure for sending data to the guest.
    763763 */
    764 typedef struct SENDDATACTX
     764struct GuestDnDSendCtx
    765765{
    766766    /** Pointer to guest target class this context belongs to. */
    … …  
    782782    /** Callback event to use. */
    783783    GuestDnDCallbackEvent               mCBEvent;
    784 
    785 } SENDDATACTX, *PSENDDATACTX;
     784};
    786785
    787786/**
    788787 * Context structure for receiving data from the guest.
    789788 */
    790 typedef struct RECVDATACTX
     789struct GuestDnDRecvCtx
    791790{
    792791    /** Pointer to guest source class this context belongs to. */
    … …  
    821820    /** Callback event to use. */
    822821    GuestDnDCallbackEvent               mCBEvent;
    823 
    824 } RECVDATACTX, *PRECVDATACTX;
     822};
    825823
    826824/**

  • trunk/src/VBox/Main/include/GuestDnDSourceImpl.h

    r82968 r85018  
    3131
    3232class RecvDataTask;
    33 struct RECVDATACTX;
    34 typedef struct RECVDATACTX *PRECVDATACTX;
     33struct GuestDnDRecvCtx;
    3534
    3635class ATL_NO_VTABLE GuestDnDSource :
    … …  
    7473    /** @name Dispatch handlers for the HGCM callbacks.
    7574     * @{ */
    76     int i_onReceiveDataHdr(PRECVDATACTX pCtx, PVBOXDNDSNDDATAHDR pDataHdr);
    77     int i_onReceiveData(PRECVDATACTX pCtx, PVBOXDNDSNDDATA pSndData);
    78     int i_onReceiveDir(PRECVDATACTX pCtx, const char *pszPath, uint32_t cbPath, uint32_t fMode);
    79     int i_onReceiveFileHdr(PRECVDATACTX pCtx, const char *pszPath, uint32_t cbPath, uint64_t cbSize, uint32_t fMode, uint32_t fFlags);
    80     int i_onReceiveFileData(PRECVDATACTX pCtx,const void *pvData, uint32_t cbData);
     75    int i_onReceiveDataHdr(GuestDnDRecvCtx *pCtx, PVBOXDNDSNDDATAHDR pDataHdr);
     76    int i_onReceiveData(GuestDnDRecvCtx *pCtx, PVBOXDNDSNDDATA pSndData);
     77    int i_onReceiveDir(GuestDnDRecvCtx *pCtx, const char *pszPath, uint32_t cbPath, uint32_t fMode);
     78    int i_onReceiveFileHdr(GuestDnDRecvCtx *pCtx, const char *pszPath, uint32_t cbPath, uint64_t cbSize, uint32_t fMode, uint32_t fFlags);
     79    int i_onReceiveFileData(GuestDnDRecvCtx *pCtx,const void *pvData, uint32_t cbData);
    8180    /** @}  */
    8281#endif
    … …  
    10099protected:
    101100
    102     int i_receiveData(PRECVDATACTX pCtx, RTMSINTERVAL msTimeout);
    103     int i_receiveRawData(PRECVDATACTX pCtx, RTMSINTERVAL msTimeout);
    104     int i_receiveURIData(PRECVDATACTX pCtx, RTMSINTERVAL msTimeout);
     101    int i_receiveData(GuestDnDRecvCtx *pCtx, RTMSINTERVAL msTimeout);
     102    int i_receiveRawData(GuestDnDRecvCtx *pCtx, RTMSINTERVAL msTimeout);
     103    int i_receiveURIData(GuestDnDRecvCtx *pCtx, RTMSINTERVAL msTimeout);
    105104
    106105protected:
    … …  
    112111        /** The context for receiving data from the guest.
    113112         *  At the moment only one transfer at a time is supported. */
    114         RECVDATACTX mRecvCtx;
     113        GuestDnDRecvCtx mRecvCtx;
    115114    } mData;
    116115

  • trunk/src/VBox/Main/include/GuestDnDTargetImpl.h

    r82968 r85018  
    2828#include <VBox/HostServices/DragAndDropSvc.h>
    2929
    30 struct SENDDATACTX;
    31 typedef struct SENDDATACTX *PSENDDATACTX;
     30struct GuestDnDSendCtx;
    3231class SendDataTask;
    3332
    … …  
    8786protected:
    8887
    89     int i_sendData(PSENDDATACTX pCtx, RTMSINTERVAL msTimeout);
    90     int i_sendDataBody(PSENDDATACTX pCtx, GuestDnDData *pData);
    91     int i_sendDataHeader(PSENDDATACTX pCtx, GuestDnDData *pData, GuestDnDURIData *pURIData /* = NULL */);
    92     int i_sendDirectory(PSENDDATACTX pCtx, GuestDnDURIObjCtx *pObjCtx, GuestDnDMsg *pMsg);
    93     int i_sendFile(PSENDDATACTX pCtx, GuestDnDURIObjCtx *pObjCtx, GuestDnDMsg *pMsg);
    94     int i_sendFileData(PSENDDATACTX pCtx, GuestDnDURIObjCtx *pObjCtx, GuestDnDMsg *pMsg);
    95     int i_sendRawData(PSENDDATACTX pCtx, RTMSINTERVAL msTimeout);
    96     int i_sendURIData(PSENDDATACTX pCtx, RTMSINTERVAL msTimeout);
    97     int i_sendURIDataLoop(PSENDDATACTX pCtx, GuestDnDMsg *pMsg);
     88    int i_sendData(GuestDnDSendCtx *pCtx, RTMSINTERVAL msTimeout);
     89    int i_sendDataBody(GuestDnDSendCtx *pCtx, GuestDnDData *pData);
     90    int i_sendDataHeader(GuestDnDSendCtx *pCtx, GuestDnDData *pData, GuestDnDURIData *pURIData /* = NULL */);
     91    int i_sendDirectory(GuestDnDSendCtx *pCtx, GuestDnDURIObjCtx *pObjCtx, GuestDnDMsg *pMsg);
     92    int i_sendFile(GuestDnDSendCtx *pCtx, GuestDnDURIObjCtx *pObjCtx, GuestDnDMsg *pMsg);
     93    int i_sendFileData(GuestDnDSendCtx *pCtx, GuestDnDURIObjCtx *pObjCtx, GuestDnDMsg *pMsg);
     94    int i_sendRawData(GuestDnDSendCtx *pCtx, RTMSINTERVAL msTimeout);
     95    int i_sendURIData(GuestDnDSendCtx *pCtx, RTMSINTERVAL msTimeout);
     96    int i_sendURIDataLoop(GuestDnDSendCtx *pCtx, GuestDnDMsg *pMsg);
    9897
    9998protected:

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

    r85002 r85018  
    7575public:
    7676
    77     RecvDataTask(GuestDnDSource *pSource, PRECVDATACTX pCtx)
     77    RecvDataTask(GuestDnDSource *pSource, GuestDnDRecvCtx *pCtx)
    7878        : GuestDnDSourceTask(pSource)
    7979        , mpCtx(pCtx)
    … …  
    8989    virtual ~RecvDataTask(void) { }
    9090
    91     PRECVDATACTX getCtx(void) { return mpCtx; }
     91    GuestDnDRecvCtx *getCtx(void) { return mpCtx; }
    9292
    9393protected:
    9494
    9595    /** Pointer to receive data context. */
    96     PRECVDATACTX mpCtx;
     96    GuestDnDRecvCtx *mpCtx;
    9797};
    9898
    … …  
    424424        return setError(E_FAIL, tr("Current drop operation still in progress"));
    425425
    426     PRECVDATACTX pCtx = &mData.mRecvCtx;
     426    GuestDnDRecvCtx *pCtx = &mData.mRecvCtx;
    427427    HRESULT hr = S_OK;
    428428
    … …  
    541541
    542542#ifdef VBOX_WITH_DRAG_AND_DROP_GH
    543 int GuestDnDSource::i_onReceiveDataHdr(PRECVDATACTX pCtx, PVBOXDNDSNDDATAHDR pDataHdr)
     543int GuestDnDSource::i_onReceiveDataHdr(GuestDnDRecvCtx *pCtx, PVBOXDNDSNDDATAHDR pDataHdr)
    544544{
    545545    AssertPtrReturn(pCtx,  VERR_INVALID_POINTER);
    … …  
    559559}
    560560
    561 int GuestDnDSource::i_onReceiveData(PRECVDATACTX pCtx, PVBOXDNDSNDDATA pSndData)
     561int GuestDnDSource::i_onReceiveData(GuestDnDRecvCtx *pCtx, PVBOXDNDSNDDATA pSndData)
    562562{
    563563    AssertPtrReturn(pCtx,     VERR_INVALID_POINTER);
    … …  
    659659}
    660660
    661 int GuestDnDSource::i_onReceiveDir(PRECVDATACTX pCtx, const char *pszPath, uint32_t cbPath, uint32_t fMode)
     661int GuestDnDSource::i_onReceiveDir(GuestDnDRecvCtx *pCtx, const char *pszPath, uint32_t cbPath, uint32_t fMode)
    662662{
    663663    AssertPtrReturn(pCtx,    VERR_INVALID_POINTER);
    … …  
    732732}
    733733
    734 int GuestDnDSource::i_onReceiveFileHdr(PRECVDATACTX pCtx, const char *pszPath, uint32_t cbPath,
     734int GuestDnDSource::i_onReceiveFileHdr(GuestDnDRecvCtx *pCtx, const char *pszPath, uint32_t cbPath,
    735735                                       uint64_t cbSize, uint32_t fMode, uint32_t fFlags)
    736736{
    … …  
    866866}
    867867
    868 int GuestDnDSource::i_onReceiveFileData(PRECVDATACTX pCtx, const void *pvData, uint32_t cbData)
     868int GuestDnDSource::i_onReceiveFileData(GuestDnDRecvCtx *pCtx, const void *pvData, uint32_t cbData)
    869869{
    870870    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
    … …  
    951951 *          intentional or not.
    952952 */
    953 int GuestDnDSource::i_receiveData(PRECVDATACTX pCtx, RTMSINTERVAL msTimeout)
     953int GuestDnDSource::i_receiveData(GuestDnDRecvCtx *pCtx, RTMSINTERVAL msTimeout)
    954954{
    955955    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
    … …  
    10791079}
    10801080
    1081 int GuestDnDSource::i_receiveRawData(PRECVDATACTX pCtx, RTMSINTERVAL msTimeout)
     1081int GuestDnDSource::i_receiveRawData(GuestDnDRecvCtx *pCtx, RTMSINTERVAL msTimeout)
    10821082{
    10831083    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
    … …  
    11841184}
    11851185
    1186 int GuestDnDSource::i_receiveURIData(PRECVDATACTX pCtx, RTMSINTERVAL msTimeout)
     1186int GuestDnDSource::i_receiveURIData(GuestDnDRecvCtx *pCtx, RTMSINTERVAL msTimeout)
    11871187{
    11881188    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
    … …  
    13191319DECLCALLBACK(int) GuestDnDSource::i_receiveRawDataCallback(uint32_t uMsg, void *pvParms, size_t cbParms, void *pvUser)
    13201320{
    1321     PRECVDATACTX pCtx = (PRECVDATACTX)pvUser;
     1321    GuestDnDRecvCtx *pCtx = (GuestDnDRecvCtx *)pvUser;
    13221322    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
    13231323
    … …  
    14481448DECLCALLBACK(int) GuestDnDSource::i_receiveURIDataCallback(uint32_t uMsg, void *pvParms, size_t cbParms, void *pvUser)
    14491449{
    1450     PRECVDATACTX pCtx = (PRECVDATACTX)pvUser;
     1450    GuestDnDRecvCtx *pCtx = (GuestDnDRecvCtx *)pvUser;
    14511451    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
    14521452

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

    r84998 r85018  
    7878public:
    7979
    80     SendDataTask(GuestDnDTarget *pTarget, PSENDDATACTX pCtx)
     80    SendDataTask(GuestDnDTarget *pTarget, GuestDnDSendCtx *pCtx)
    8181        : GuestDnDTargetTask(pTarget),
    8282          mpCtx(pCtx)
    … …  
    100100
    101101
    102     PSENDDATACTX getCtx(void) { return mpCtx; }
     102    GuestDnDSendCtx *getCtx(void) { return mpCtx; }
    103103
    104104protected:
    105105
    106106    /** Pointer to send data context. */
    107     PSENDDATACTX mpCtx;
     107    GuestDnDSendCtx *mpCtx;
    108108};
    109109
    … …  
    633633
    634634    SendDataTask *pTask = NULL;
    635     PSENDDATACTX pSendCtx = NULL;
     635    GuestDnDSendCtx *pSendCtx = NULL;
    636636
    637637    try
    638638    {
    639639        //pSendCtx is passed into SendDataTask where one is deleted in destructor
    640         pSendCtx = new SENDDATACTX;
    641         RT_BZERO(pSendCtx, sizeof(SENDDATACTX));
     640        pSendCtx = new GuestDnDSendCtx();
     641        RT_BZERO(pSendCtx, sizeof(GuestDnDSendCtx));
    642642
    643643        pSendCtx->mpTarget      = this;
    … …  
    762762 *          intentional or not.
    763763 */
    764 int GuestDnDTarget::i_sendData(PSENDDATACTX pCtx, RTMSINTERVAL msTimeout)
     764int GuestDnDTarget::i_sendData(GuestDnDSendCtx *pCtx, RTMSINTERVAL msTimeout)
    765765{
    766766    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
    … …  
    802802}
    803803
    804 int GuestDnDTarget::i_sendDataBody(PSENDDATACTX pCtx, GuestDnDData *pData)
     804int GuestDnDTarget::i_sendDataBody(GuestDnDSendCtx *pCtx, GuestDnDData *pData)
    805805{
    806806    AssertPtrReturn(pCtx,  VERR_INVALID_POINTER);
    … …  
    844844}
    845845
    846 int GuestDnDTarget::i_sendDataHeader(PSENDDATACTX pCtx, GuestDnDData *pData, GuestDnDURIData *pURIData /* = NULL */)
     846int GuestDnDTarget::i_sendDataHeader(GuestDnDSendCtx *pCtx, GuestDnDData *pData, GuestDnDURIData *pURIData /* = NULL */)
    847847{
    848848    AssertPtrReturn(pCtx,  VERR_INVALID_POINTER);
    … …  
    873873}
    874874
    875 int GuestDnDTarget::i_sendDirectory(PSENDDATACTX pCtx, GuestDnDURIObjCtx *pObjCtx, GuestDnDMsg *pMsg)
     875int GuestDnDTarget::i_sendDirectory(GuestDnDSendCtx *pCtx, GuestDnDURIObjCtx *pObjCtx, GuestDnDMsg *pMsg)
    876876{
    877877    AssertPtrReturn(pCtx,    VERR_INVALID_POINTER);
    … …  
    900900}
    901901
    902 int GuestDnDTarget::i_sendFile(PSENDDATACTX pCtx, GuestDnDURIObjCtx *pObjCtx, GuestDnDMsg *pMsg)
     902int GuestDnDTarget::i_sendFile(GuestDnDSendCtx *pCtx, GuestDnDURIObjCtx *pObjCtx, GuestDnDMsg *pMsg)
    903903{
    904904    AssertPtrReturn(pCtx,    VERR_INVALID_POINTER);
    … …  
    985985}
    986986
    987 int GuestDnDTarget::i_sendFileData(PSENDDATACTX pCtx, GuestDnDURIObjCtx *pObjCtx, GuestDnDMsg *pMsg)
     987int GuestDnDTarget::i_sendFileData(GuestDnDSendCtx *pCtx, GuestDnDURIObjCtx *pObjCtx, GuestDnDMsg *pMsg)
    988988{
    989989    AssertPtrReturn(pCtx,    VERR_INVALID_POINTER);
    … …  
    10651065DECLCALLBACK(int) GuestDnDTarget::i_sendURIDataCallback(uint32_t uMsg, void *pvParms, size_t cbParms, void *pvUser)
    10661066{
    1067     PSENDDATACTX pCtx = (PSENDDATACTX)pvUser;
     1067    GuestDnDSendCtx *pCtx = (GuestDnDSendCtx *)pvUser;
    10681068    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
    10691069
    … …  
    12741274}
    12751275
    1276 int GuestDnDTarget::i_sendURIData(PSENDDATACTX pCtx, RTMSINTERVAL msTimeout)
     1276int GuestDnDTarget::i_sendURIData(GuestDnDSendCtx *pCtx, RTMSINTERVAL msTimeout)
    12771277{
    12781278    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
    … …  
    14301430}
    14311431
    1432 int GuestDnDTarget::i_sendURIDataLoop(PSENDDATACTX pCtx, GuestDnDMsg *pMsg)
     1432int GuestDnDTarget::i_sendURIDataLoop(GuestDnDSendCtx *pCtx, GuestDnDMsg *pMsg)
    14331433{
    14341434    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
    … …  
    14891489}
    14901490
    1491 int GuestDnDTarget::i_sendRawData(PSENDDATACTX pCtx, RTMSINTERVAL msTimeout)
     1491int GuestDnDTarget::i_sendRawData(GuestDnDSendCtx *pCtx, RTMSINTERVAL msTimeout)
    14921492{
    14931493    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
Note: See TracChangeset for help on using the changeset viewer.

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