Changeset 85402 in vbox for trunk/src/VBox/Main/include

Timestamp:

Jul 21, 2020 3:10:32 PM (4 years ago)

Author:

vboxsync

Message:

DnD/Main: Renaming; use size_t where appropriate.

Location:

trunk/src/VBox/Main/include

Files:

• GuestDnDPrivate.h (modified) (23 diffs)
• GuestDnDSourceImpl.h (modified) (1 diff)
• GuestDnDTargetImpl.h (modified) (1 diff)

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

@@ -58 +58 @@
 
     GuestDnDCallbackEvent(void)
-        : mSemEvent(NIL_RTSEMEVENT)
-        , mRc(VINF_SUCCESS) { }
+        : m_SemEvent(NIL_RTSEMEVENT)
+        , m_Rc(VINF_SUCCESS) { }
 
     virtual ~GuestDnDCallbackEvent(void);
@@ -69 +69 @@
     int Notify(int rc = VINF_SUCCESS);
 
-    int Result(void) const { return mRc; }
+    int Result(void) const { return m_Rc; }
 
     int Wait(RTMSINTERVAL msTimeout);
@@ -76 +76 @@
 
     /** Event semaphore to notify on error/completion. */
-    RTSEMEVENT mSemEvent;
+    RTSEMEVENT m_SemEvent;
     /** Callback result. */
-    int        mRc;
+    int        m_Rc;
 };
 
@@ -96 +96 @@
     }
 
-    uint32_t add(const void *pvDataAdd, uint32_t cbDataAdd)
+    size_t add(const void *pvDataAdd, size_t cbDataAdd)
     {
         LogFlowThisFunc(("pvDataAdd=%p, cbDataAdd=%zu\n", pvDataAdd, cbDataAdd));
@@ -116 +116 @@
     }
 
-    uint32_t add(const std::vector<BYTE> &vecAdd)
+    size_t add(const std::vector<BYTE> &vecAdd)
     {
         if (!vecAdd.size())
@@ -142 +142 @@
     }
 
-    int resize(uint32_t cbSize)
+    int resize(size_t cbSize)
     {
         if (!cbSize)
@@ -184 +184 @@
     void        *pvData;
     /** Used bytes of meta data. Must not exceed cbAllocated. */
-    uint32_t     cbData;
+    size_t       cbData;
     /** Size (in bytes) of allocated meta data. */
-    uint32_t     cbAllocated;
+    size_t       cbAllocated;
 };
 
@@ -203 +203 @@
     }
 
-    uint64_t addProcessed(uint32_t cbDataAdd)
-    {
-        const uint64_t cbTotal = Meta.cbData + cbExtra; RT_NOREF(cbTotal);
+    size_t addProcessed(size_t cbDataAdd)
+    {
+        const size_t cbTotal = Meta.cbData + cbExtra; RT_NOREF(cbTotal);
         Assert(cbProcessed + cbDataAdd <= cbTotal);
         cbProcessed += cbDataAdd;
@@ -213 +213 @@
     bool isComplete(void) const
     {
-        const uint64_t cbTotal = Meta.cbData + cbExtra;
-        LogFlowFunc(("cbProcessed=%RU64, cbTotal=%RU64\n", cbProcessed, cbTotal));
+        const size_t cbTotal = Meta.cbData + cbExtra;
+        LogFlowFunc(("cbProcessed=%zu, cbTotal=%zu\n", cbProcessed, cbTotal));
         Assert(cbProcessed <= cbTotal);
         return (cbProcessed == cbTotal);
@@ -221 +221 @@
     uint8_t getPercentComplete(void) const
     {
-        const uint64_t cbTotal = Meta.cbData + cbExtra;
+        const size_t cbTotal = Meta.cbData + cbExtra;
         return (uint8_t)(cbProcessed * 100 / RT_MAX(cbTotal, 1));
     }
 
-    uint64_t getRemaining(void) const
-    {
-        const uint64_t cbTotal = Meta.cbData + cbExtra;
+    size_t getRemaining(void) const
+    {
+        const size_t cbTotal = Meta.cbData + cbExtra;
         AssertReturn(cbProcessed <= cbTotal, 0);
         return cbTotal - cbProcessed;
     }
 
-    uint64_t getTotal(void) const
+    size_t getTotal(void) const
     {
         return Meta.cbData + cbExtra;
@@ -248 +248 @@
      *  This might be an URI list or just plain raw data,
      *  according to the format being sent. */
-    GuestDnDMetaData  Meta;
+    GuestDnDMetaData   Meta;
     /** Extra data to send/receive (in bytes). Can be 0 for raw data.
      *  For (file) transfers this is the total size for all files. */
-    uint64_t          cbExtra;
+    size_t             cbExtra;
     /** Overall size (in bytes) of processed data. */
-    uint64_t          cbProcessed;
+    size_t             cbProcessed;
 };
 
@@ -334 +334 @@
 {
     GuestDnDTransferSendData()
-        : mfObjState(0)
-    {
-        RT_ZERO(mList);
+        : fObjState(0)
+    {
+        RT_ZERO(List);
     }
 
@@ -346 +346 @@
     void destroy(void)
     {
-        DnDTransferListDestroy(&mList);
+        DnDTransferListDestroy(&List);
     }
 
     void reset(void)
     {
-        DnDTransferListReset(&mList);
-        mfObjState = 0;
+        DnDTransferListReset(&List);
+        fObjState = 0;
 
         GuestDnDTransferData::reset();
@@ -358 +358 @@
 
     /** Transfer List to handle. */
-    DNDTRANSFERLIST                     mList;
+    DNDTRANSFERLIST                     List;
     /** Current state of object in transfer.
      *  This is needed for keeping compatibility to old(er) DnD HGCM protocols.
      *
      *  At the moment we only support transferring one object at a time. */
-    uint32_t                            mfObjState;
+    uint32_t                            fObjState;
 };
 
@@ -372 +372 @@
 {
     /** Pointer to guest target class this context belongs to. */
-    GuestDnDTarget                     *mpTarget;
+    GuestDnDTarget                     *pTarget;
     /** Pointer to guest response class this context belongs to. */
-    GuestDnDResponse                   *mpResp;
+    GuestDnDResponse                   *pResp;
     /** Flag indicating whether a file transfer is active and
      *  initiated by the host. */
-    bool                                mIsActive;
+    bool                                fIsActive;
     /** Target (VM) screen ID. */
-    uint32_t                            mScreenID;
+    uint32_t                            uScreenID;
     /** Drag'n drop format requested by the guest. */
-    com::Utf8Str                        mFmtReq;
+    com::Utf8Str                        strFmtReq;
     /** Transfer data structure. */
-    GuestDnDTransferSendData            mTransfer;
+    GuestDnDTransferSendData            Transfer;
     /** Callback event to use. */
-    GuestDnDCallbackEvent               mCBEvent;
+    GuestDnDCallbackEvent               EventCallback;
 };
 
@@ -392 +392 @@
     GuestDnDTransferRecvData()
     {
-        RT_ZERO(mDroppedFiles);
-        RT_ZERO(mList);
-        RT_ZERO(mObj);
+        RT_ZERO(DroppedFiles);
+        RT_ZERO(List);
+        RT_ZERO(ObjCur);
     }
 
@@ -404 +404 @@
     void destroy(void)
     {
-        DnDTransferListDestroy(&mList);
+        DnDTransferListDestroy(&List);
     }
 
     void reset(void)
     {
-        DnDDroppedFilesClose(&mDroppedFiles);
-        DnDTransferListReset(&mList);
-        DnDTransferObjectReset(&mObj);
+        DnDDroppedFilesClose(&DroppedFiles);
+        DnDTransferListReset(&List);
+        DnDTransferObjectReset(&ObjCur);
 
         GuestDnDTransferData::reset();
@@ -418 +418 @@
     /** The "VirtualBox Dropped Files" directory on the host we're going
      *  to utilize for transferring files from guest to the host. */
-    DNDDROPPEDFILES                     mDroppedFiles;
+    DNDDROPPEDFILES                     DroppedFiles;
     /** Transfer List to handle.
      *  Currently we only support one transfer list at a time. */
-    DNDTRANSFERLIST                     mList;
+    DNDTRANSFERLIST                     List;
     /** Current transfer object being handled.
      *  Currently we only support one transfer object at a time. */
-    DNDTRANSFEROBJECT                   mObj;
+    DNDTRANSFEROBJECT                   ObjCur;
 };
 
@@ -433 +433 @@
 {
     /** Pointer to guest source class this context belongs to. */
-    GuestDnDSource                     *mpSource;
+    GuestDnDSource                     *pSource;
     /** Pointer to guest response class this context belongs to. */
-    GuestDnDResponse                   *mpResp;
+    GuestDnDResponse                   *pResp;
     /** Flag indicating whether a file transfer is active and
      *  initiated by the host. */
-    bool                                mIsActive;
+    bool                                fIsActive;
     /** Formats offered by the guest (and supported by the host). */
-    GuestDnDMIMEList                    mFmtOffered;
-    /** Original drop format requested to receive from the guest. */
-    com::Utf8Str                        mFmtReq;
+    GuestDnDMIMEList                    lstFmtOffered;
+    /** Drag'n drop format requested by the guest. */
+    com::Utf8Str                        strFmtReq;
     /** Intermediate drop format to be received from the guest.
      *  Some original drop formats require a different intermediate
@@ -451 +451 @@
      *  then pointing to the file path on the host with the data
      *  in "text/plain" format returned. */
-    com::Utf8Str                        mFmtRecv;
+    com::Utf8Str                        strFmtRecv;
     /** Desired drop action to perform on the host.
      *  Needed to tell the guest if data has to be
      *  deleted e.g. when moving instead of copying. */
-    VBOXDNDACTION                       mAction;
+    VBOXDNDACTION                       enmAction;
     /** Transfer data structure. */
-    GuestDnDTransferRecvData            mTransfer;
+    GuestDnDTransferRecvData            Transfer;
     /** Callback event to use. */
-    GuestDnDCallbackEvent               mCBEvent;
+    GuestDnDCallbackEvent               EventCallback;
 };
 
@@ -618 +618 @@
     /** Pointer to user-supplied data. */
     void                *pvUser;
-
 } GuestDnDCallback;
 
@@ -813 +812 @@
 
     int sendCancel(void);
-    int updateProgress(GuestDnDData *pData, GuestDnDResponse *pResp, uint32_t cbDataAdd = 0);
+    int updateProgress(GuestDnDData *pData, GuestDnDResponse *pResp, size_t cbDataAdd = 0);
     int waitForEvent(GuestDnDCallbackEvent *pEvent, GuestDnDResponse *pResp, RTMSINTERVAL msTimeout);
 
@@ -834 +833 @@
     {
         /** Number of active transfers (guest->host or host->guest). */
-        uint32_t                    m_cTransfersPending;
+        uint32_t                    cTransfersPending;
         /** The DnD protocol version to use, depending on the
          *  installed Guest Additions. See DragAndDropSvc.h for
          *  a protocol changelog. */
-        uint32_t                    m_uProtocolVersion;
+        uint32_t                    uProtocolVersion;
         /** Outgoing message queue (FIFO). */
-        GuestDnDMsgList             m_lstMsgOut;
-    } mDataBase;
+        GuestDnDMsgList             lstMsgOut;
+    } m_DataBase;
 };
 #endif /* !MAIN_INCLUDED_GuestDnDPrivate_h */

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

@@ -94 +94 @@
      * @{ */
     static DECLCALLBACK(int) i_receiveRawDataCallback(uint32_t uMsg, void *pvParms, size_t cbParms, void *pvUser);
-    static DECLCALLBACK(int) i_receiveURIDataCallback(uint32_t uMsg, void *pvParms, size_t cbParms, void *pvUser);
+    static DECLCALLBACK(int) i_receiveTransferDataCallback(uint32_t uMsg, void *pvParms, size_t cbParms, void *pvUser);
     /** @}  */
 

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

@@ -81 +81 @@
     /** @name Callbacks for dispatch handler.
      * @{ */
-    static DECLCALLBACK(int) i_sendURIDataCallback(uint32_t uMsg, void *pvParms, size_t cbParms, void *pvUser);
+    static DECLCALLBACK(int) i_sendTransferDataCallback(uint32_t uMsg, void *pvParms, size_t cbParms, void *pvUser);
     /** @}  */