VirtualBox

Changeset 57425 in vbox for trunk/src/VBox/Main/src-server


Ignore:
Timestamp:
Aug 18, 2015 12:41:48 PM (9 years ago)
Author:
vboxsync
Message:

DECLCALLBACK

Location:
trunk/src/VBox/Main/src-server
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Main/src-server/ApplianceImplIO.cpp

    r57372 r57425  
    194194 ******************************************************************************/
    195195
    196 static int fileOpenCallback(void * /* pvUser */, const char *pszLocation, uint32_t fOpen,
    197                               PFNVDCOMPLETED pfnCompleted, void **ppInt)
     196static DECLCALLBACK(int) fileOpenCallback(void * /* pvUser */, const char *pszLocation, uint32_t fOpen,
     197                                          PFNVDCOMPLETED pfnCompleted, void **ppInt)
    198198{
    199199    /* Validate input. */
    … …  
    219219}
    220220
    221 static int fileCloseCallback(void * /* pvUser */, void *pvStorage)
     221static DECLCALLBACK(int) fileCloseCallback(void * /* pvUser */, void *pvStorage)
    222222{
    223223    /* Validate input. */
    … …  
    236236}
    237237
    238 static int fileDeleteCallback(void * /* pvUser */, const char *pcszFilename)
     238static DECLCALLBACK(int) fileDeleteCallback(void * /* pvUser */, const char *pcszFilename)
    239239{
    240240    DEBUG_PRINT_FLOW();
    … …  
    243243}
    244244
    245 static int fileMoveCallback(void * /* pvUser */, const char *pcszSrc, const char *pcszDst, unsigned fMove)
     245static DECLCALLBACK(int) fileMoveCallback(void * /* pvUser */, const char *pcszSrc, const char *pcszDst, unsigned fMove)
    246246{
    247247    DEBUG_PRINT_FLOW();
    … …  
    250250}
    251251
    252 static int fileGetFreeSpaceCallback(void * /* pvUser */, const char *pcszFilename, int64_t *pcbFreeSpace)
     252static DECLCALLBACK(int) fileGetFreeSpaceCallback(void * /* pvUser */, const char *pcszFilename, int64_t *pcbFreeSpace)
    253253{
    254254    /* Validate input. */
    … …  
    261261}
    262262
    263 static int fileGetModificationTimeCallback(void * /* pvUser */, const char *pcszFilename, PRTTIMESPEC pModificationTime)
     263static DECLCALLBACK(int) fileGetModificationTimeCallback(void * /* pvUser */, const char *pcszFilename,
     264                                                         PRTTIMESPEC pModificationTime)
    264265{
    265266    /* Validate input. */
    … …  
    272273}
    273274
    274 static int fileGetSizeCallback(void * /* pvUser */, void *pvStorage, uint64_t *pcbSize)
     275static DECLCALLBACK(int) fileGetSizeCallback(void * /* pvUser */, void *pvStorage, uint64_t *pcbSize)
    275276{
    276277    /* Validate input. */
    … …  
    284285}
    285286
    286 static int fileSetSizeCallback(void * /* pvUser */, void *pvStorage, uint64_t cbSize)
     287static DECLCALLBACK(int) fileSetSizeCallback(void * /* pvUser */, void *pvStorage, uint64_t cbSize)
    287288{
    288289    /* Validate input. */
    … …  
    296297}
    297298
    298 static int fileWriteSyncCallback(void * /* pvUser */, void *pvStorage, uint64_t uOffset,
    299                                    const void *pvBuf, size_t cbWrite, size_t *pcbWritten)
     299static DECLCALLBACK(int) fileWriteSyncCallback(void * /* pvUser */, void *pvStorage, uint64_t uOffset,
     300                                               const void *pvBuf, size_t cbWrite, size_t *pcbWritten)
    300301{
    301302    /* Validate input. */
    … …  
    307308}
    308309
    309 static int fileReadSyncCallback(void * /* pvUser */, void *pvStorage, uint64_t uOffset,
    310                                   void *pvBuf, size_t cbRead, size_t *pcbRead)
     310static DECLCALLBACK(int) fileReadSyncCallback(void * /* pvUser */, void *pvStorage, uint64_t uOffset,
     311                                              void *pvBuf, size_t cbRead, size_t *pcbRead)
    311312{
    312313    /* Validate input. */
    … …  
    320321}
    321322
    322 static int fileFlushSyncCallback(void * /* pvUser */, void *pvStorage)
     323static DECLCALLBACK(int) fileFlushSyncCallback(void * /* pvUser */, void *pvStorage)
    323324{
    324325    /* Validate input. */
    … …  
    586587
    587588/** @interface_method_impl{VDINTERFACEIO,pfnClose}  */
    588 static int fssRdOnly_Close(void *pvUser, void *pvStorage)
     589static DECLCALLBACK(int) fssRdOnly_Close(void *pvUser, void *pvStorage)
    589590{
    590591    PIOSRDONLYINTERNAL      pFile = (PIOSRDONLYINTERNAL)pvStorage;
    … …  
    10271028}
    10281029
    1029 static int shaOpenCallback(void *pvUser, const char *pszLocation, uint32_t fOpen,
    1030                               PFNVDCOMPLETED pfnCompleted, void **ppInt)
     1030static DECLCALLBACK(int) shaOpenCallback(void *pvUser, const char *pszLocation, uint32_t fOpen,
     1031                                         PFNVDCOMPLETED pfnCompleted, void **ppInt)
    10311032{
    10321033    /* Validate input. */
    … …  
    11371138}
    11381139
    1139 static int shaCloseCallback(void *pvUser, void *pvStorage)
     1140static DECLCALLBACK(int) shaCloseCallback(void *pvUser, void *pvStorage)
    11401141{
    11411142    /* Validate input. */
    … …  
    12131214}
    12141215
    1215 static int shaDeleteCallback(void *pvUser, const char *pcszFilename)
     1216static DECLCALLBACK(int) shaDeleteCallback(void *pvUser, const char *pcszFilename)
    12161217{
    12171218    /* Validate input. */
    … …  
    12271228}
    12281229
    1229 static int shaMoveCallback(void *pvUser, const char *pcszSrc, const char *pcszDst, unsigned fMove)
     1230static DECLCALLBACK(int) shaMoveCallback(void *pvUser, const char *pcszSrc, const char *pcszDst, unsigned fMove)
    12301231{
    12311232    /* Validate input. */
    … …  
    12421243}
    12431244
    1244 static int shaGetFreeSpaceCallback(void *pvUser, const char *pcszFilename, int64_t *pcbFreeSpace)
     1245static DECLCALLBACK(int) shaGetFreeSpaceCallback(void *pvUser, const char *pcszFilename, int64_t *pcbFreeSpace)
    12451246{
    12461247    /* Validate input. */
    … …  
    12561257}
    12571258
    1258 static int shaGetModificationTimeCallback(void *pvUser, const char *pcszFilename, PRTTIMESPEC pModificationTime)
     1259static DECLCALLBACK(int) shaGetModificationTimeCallback(void *pvUser, const char *pcszFilename, PRTTIMESPEC pModificationTime)
    12591260{
    12601261    /* Validate input. */
    … …  
    12711272
    12721273
    1273 static int shaGetSizeCallback(void *pvUser, void *pvStorage, uint64_t *pcbSize)
     1274static DECLCALLBACK(int) shaGetSizeCallback(void *pvUser, void *pvStorage, uint64_t *pcbSize)
    12741275{
    12751276    /* Validate input. */
    … …  
    12951296}
    12961297
    1297 static int shaSetSizeCallback(void *pvUser, void *pvStorage, uint64_t cbSize)
     1298static DECLCALLBACK(int) shaSetSizeCallback(void *pvUser, void *pvStorage, uint64_t cbSize)
    12981299{
    12991300    /* Validate input. */
    … …  
    13121313}
    13131314
    1314 static int shaWriteSyncCallback(void *pvUser, void *pvStorage, uint64_t uOffset,
    1315                                  const void *pvBuf, size_t cbWrite, size_t *pcbWritten)
     1315static DECLCALLBACK(int) shaWriteSyncCallback(void *pvUser, void *pvStorage, uint64_t uOffset,
     1316                                              const void *pvBuf, size_t cbWrite, size_t *pcbWritten)
    13161317{
    13171318    /* Validate input. */
    … …  
    14081409}
    14091410
    1410 static int shaReadSyncCallback(void *pvUser, void *pvStorage, uint64_t uOffset,
    1411                                void *pvBuf, size_t cbRead, size_t *pcbRead)
     1411static DECLCALLBACK(int) shaReadSyncCallback(void *pvUser, void *pvStorage, uint64_t uOffset,
     1412                                             void *pvBuf, size_t cbRead, size_t *pcbRead)
    14121413{
    14131414    /* Validate input. */
    … …  
    15061507}
    15071508
    1508 static int shaFlushSyncCallback(void *pvUser, void *pvStorage)
     1509static DECLCALLBACK(int) shaFlushSyncCallback(void *pvUser, void *pvStorage)
    15091510{
    15101511    /* Validate input. */

  • trunk/src/VBox/Main/src-server/HostDnsService.cpp

    r56319 r57425  
    308308
    309309
    310 int HostDnsMonitor::threadMonitoringRoutine(RTTHREAD, void *pvUser)
     310DECLCALLBACK(int) HostDnsMonitor::threadMonitoringRoutine(RTTHREAD, void *pvUser)
    311311{
    312312    HostDnsMonitor *pThis = static_cast<HostDnsMonitor *>(pvUser);

  • trunk/src/VBox/Main/src-server/HostDnsService.h

    r56319 r57425  
    7777    HostDnsMonitor(const HostDnsMonitor &);
    7878    HostDnsMonitor& operator= (const HostDnsMonitor &);
    79     static int threadMonitoringRoutine(RTTHREAD, void *);
     79    static DECLCALLBACK(int) threadMonitoringRoutine(RTTHREAD, void *);
    8080    void pollGlobalExtraData();
    8181

  • trunk/src/VBox/Main/src-server/MachineImplCloneVM.cpp

    r56577 r57425  
    8585    }
    8686
    87     static int workerThread(RTTHREAD /* Thread */, void *pvUser)
     87    static DECLCALLBACK(int) workerThread(RTTHREAD /* Thread */, void *pvUser)
    8888    {
    8989        MachineCloneVMPrivate *pTask = static_cast<MachineCloneVMPrivate*>(pvUser);
    … …  
    123123                                     const Utf8Str &strSnapshotFolder, RTCList<ComObjPtr<Medium> > &newMedia,
    124124                                     ComObjPtr<Medium> *ppDiff) const;
    125     static int copyStateFileProgress(unsigned uPercentage, void *pvUser);
     125    static DECLCALLBACK(int) copyStateFileProgress(unsigned uPercentage, void *pvUser);
    126126
    127127    /* Private q and parent pointer */
    … …  
    748748
    749749/* static */
    750 int MachineCloneVMPrivate::copyStateFileProgress(unsigned uPercentage, void *pvUser)
     750DECLCALLBACK(int) MachineCloneVMPrivate::copyStateFileProgress(unsigned uPercentage, void *pvUser)
    751751{
    752752    ComObjPtr<Progress> pProgress = *static_cast< ComObjPtr<Progress>* >(pvUser);
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