VirtualBox

Changeset 85121 in vbox for trunk/include


Ignore:
Timestamp:
Jul 8, 2020 7:33:26 PM (5 years ago)
Author:
vboxsync
Message:

iprt/cdefs.h: Refactored the typedef use of DECLCALLBACK as well as DECLCALLBACKMEMBER to wrap the whole expression, similar to the DECLR?CALLBACKMEMBER macros. This allows adding a throw() at the end when compiling with the VC++ compiler to indicate that the callbacks won't throw anything, so we can stop supressing the C5039 warning about passing functions that can potential throw C++ exceptions to extern C code that can't necessarily cope with such (unwind,++). Introduced a few _EX variations that allows specifying different/no calling convention too, as that's handy when dynamically resolving host APIs. Fixed numerous places missing DECLCALLBACK and such. Left two angry @todos regarding use of CreateThread. bugref:9794

Location:
trunk/include
Files:
110 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/ExtPack/ExtPack.h

    r82968 r85121  
    357357     * @param   pErrInfo    Where to return extended error information.
    358358     */
    359     DECLCALLBACKMEMBER(int, pfnInstalled)(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox,
    360                                           PRTERRINFO pErrInfo);
     359    DECLCALLBACKMEMBER(int, pfnInstalled,(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox,
     360                                          PRTERRINFO pErrInfo));
    361361
    362362    /**
    … …  
    370370     *          relatively unusable.
    371371     */
    372     DECLCALLBACKMEMBER(int, pfnUninstall)(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox);
     372    DECLCALLBACKMEMBER(int, pfnUninstall,(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox));
    373373
    374374    /**
    … …  
    378378     * @param   pVirtualBox The VirtualBox interface.
    379379     */
    380     DECLCALLBACKMEMBER(void, pfnVirtualBoxReady)(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox);
     380    DECLCALLBACKMEMBER(void, pfnVirtualBoxReady,(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox));
    381381
    382382    /**
    … …  
    389389     *          last callback.
    390390     */
    391     DECLCALLBACKMEMBER(void, pfnUnload)(PCVBOXEXTPACKREG pThis);
     391    DECLCALLBACKMEMBER(void, pfnUnload,(PCVBOXEXTPACKREG pThis));
    392392
    393393    /**
    … …  
    399399     * @param   pMachine    The machine interface.
    400400     */
    401     DECLCALLBACKMEMBER(int, pfnVMCreated)(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox,
    402                                           VBOXEXTPACK_IF_CS(IMachine) *pMachine);
     401    DECLCALLBACKMEMBER(int, pfnVMCreated,(PCVBOXEXTPACKREG pThis, VBOXEXTPACK_IF_CS(IVirtualBox) *pVirtualBox,
     402                                          VBOXEXTPACK_IF_CS(IMachine) *pMachine));
    403403
    404404    /**
    … …  
    409409     * @param   pObjectId   Pointer to the object ID (UUID).
    410410     */
    411     DECLCALLBACKMEMBER(void *, pfnQueryObject)(PCVBOXEXTPACKREG pThis, PCRTUUID pObjectId);
     411    DECLCALLBACKMEMBER(void *, pfnQueryObject,(PCVBOXEXTPACKREG pThis, PCRTUUID pObjectId));
    412412
    413413    DECLR3CALLBACKMEMBER(int, pfnReserved1,(PCVBOXEXTPACKREG pThis)); /**< Reserved for minor structure revisions. */
    … …  
    444444 * @param   pErrInfo        Where to return extended error information.
    445445 */
    446 typedef DECLCALLBACK(int) FNVBOXEXTPACKREGISTER(PCVBOXEXTPACKHLP pHlp, PCVBOXEXTPACKREG *ppReg, PRTERRINFO pErrInfo);
     446typedef DECLCALLBACKTYPE(int, FNVBOXEXTPACKREGISTER,(PCVBOXEXTPACKHLP pHlp, PCVBOXEXTPACKREG *ppReg, PRTERRINFO pErrInfo));
    447447/** Pointer to a FNVBOXEXTPACKREGISTER. */
    448448typedef FNVBOXEXTPACKREGISTER *PFNVBOXEXTPACKREGISTER;
    … …  
    475475     * @param   pConsole    The Console interface.
    476476     */
    477     DECLCALLBACKMEMBER(void, pfnConsoleReady)(PCVBOXEXTPACKVMREG pThis, VBOXEXTPACK_IF_CS(IConsole) *pConsole);
     477    DECLCALLBACKMEMBER(void, pfnConsoleReady,(PCVBOXEXTPACKVMREG pThis, VBOXEXTPACK_IF_CS(IConsole) *pConsole));
    478478
    479479    /**
    … …  
    484484     * @remarks The helpers are not available at this point in time.
    485485     */
    486     DECLCALLBACKMEMBER(void, pfnUnload)(PCVBOXEXTPACKVMREG pThis);
     486    DECLCALLBACKMEMBER(void, pfnUnload,(PCVBOXEXTPACKVMREG pThis));
    487487
    488488    /**
    … …  
    494494     * @param   pVM         The cross context VM structure.
    495495     */
    496     DECLCALLBACKMEMBER(int, pfnVMConfigureVMM)(PCVBOXEXTPACKVMREG pThis, VBOXEXTPACK_IF_CS(IConsole) *pConsole, PVM pVM);
     496    DECLCALLBACKMEMBER(int, pfnVMConfigureVMM,(PCVBOXEXTPACKVMREG pThis, VBOXEXTPACK_IF_CS(IConsole) *pConsole, PVM pVM));
    497497
    498498    /**
    … …  
    504504     * @param   pVM         The cross context VM structure.
    505505     */
    506     DECLCALLBACKMEMBER(int, pfnVMPowerOn)(PCVBOXEXTPACKVMREG pThis, VBOXEXTPACK_IF_CS(IConsole) *pConsole, PVM pVM);
     506    DECLCALLBACKMEMBER(int, pfnVMPowerOn,(PCVBOXEXTPACKVMREG pThis, VBOXEXTPACK_IF_CS(IConsole) *pConsole, PVM pVM));
    507507
    508508    /**
    … …  
    513513     * @param   pVM         The cross context VM structure. Can be NULL.
    514514     */
    515     DECLCALLBACKMEMBER(void, pfnVMPowerOff)(PCVBOXEXTPACKVMREG pThis, VBOXEXTPACK_IF_CS(IConsole) *pConsole, PVM pVM);
     515    DECLCALLBACKMEMBER(void, pfnVMPowerOff,(PCVBOXEXTPACKVMREG pThis, VBOXEXTPACK_IF_CS(IConsole) *pConsole, PVM pVM));
    516516
    517517    /**
    … …  
    522522     * @param   pObjectId   Pointer to the object ID (UUID).
    523523     */
    524     DECLCALLBACKMEMBER(void *, pfnQueryObject)(PCVBOXEXTPACKVMREG pThis, PCRTUUID pObjectId);
     524    DECLCALLBACKMEMBER(void *, pfnQueryObject,(PCVBOXEXTPACKVMREG pThis, PCRTUUID pObjectId));
    525525
    526526    DECLR3CALLBACKMEMBER(int, pfnReserved1,(PCVBOXEXTPACKVMREG pThis)); /**< Reserved for minor structure revisions. */
    … …  
    557557 * @param   pErrInfo        Where to return extended error information.
    558558 */
    559 typedef DECLCALLBACK(int) FNVBOXEXTPACKVMREGISTER(PCVBOXEXTPACKHLP pHlp, PCVBOXEXTPACKVMREG *ppReg, PRTERRINFO pErrInfo);
     559typedef DECLCALLBACKTYPE(int, FNVBOXEXTPACKVMREGISTER,(PCVBOXEXTPACKHLP pHlp, PCVBOXEXTPACKVMREG *ppReg, PRTERRINFO pErrInfo));
    560560/** Pointer to a FNVBOXEXTPACKVMREGISTER. */
    561561typedef FNVBOXEXTPACKVMREGISTER *PFNVBOXEXTPACKVMREGISTER;

  • trunk/include/VBox/Graphics/HGSMI.h

    r82968 r85121  
    9696 * @thread  EMT on the host side.
    9797 */
    98 typedef DECLCALLBACK(int) FNHGSMICHANNELHANDLER(void *pvHandler, uint16_t u16ChannelInfo,
    99                                                 RT_UNTRUSTED_VOLATILE_HSTGST void *pvBuffer, HGSMISIZE cbBuffer);
     98typedef DECLCALLBACKTYPE(int, FNHGSMICHANNELHANDLER,(void *pvHandler, uint16_t u16ChannelInfo,
     99                                                     RT_UNTRUSTED_VOLATILE_HSTGST void *pvBuffer, HGSMISIZE cbBuffer));
    100100/** Pointer to a channel handler callback. */
    101101typedef FNHGSMICHANNELHANDLER *PFNHGSMICHANNELHANDLER;

  • trunk/include/VBox/Graphics/HGSMIDefs.h

    r82968 r85121  
    119119
    120120    /* Allocate system memory. */
    121     DECLCALLBACKMEMBER(void *, pfnAlloc)(void *pvEnv, HGSMISIZE cb);
     121    DECLCALLBACKMEMBER(void *, pfnAlloc,(void *pvEnv, HGSMISIZE cb));
    122122
    123123    /* Free system memory. */
    124     DECLCALLBACKMEMBER(void, pfnFree)(void *pvEnv, void *pv);
     124    DECLCALLBACKMEMBER(void, pfnFree,(void *pvEnv, void *pv));
    125125} HGSMIENV;
    126126

  • trunk/include/VBox/Graphics/VBoxUhgsmi.h

    r82968 r85121  
    7777/* the caller can specify NULL as a hSynch and specify a valid enmSynchType to make UHGSMI create a proper object itself,
    7878 *  */
    79 typedef DECLCALLBACK(int) FNVBOXUHGSMI_BUFFER_CREATE(PVBOXUHGSMI pHgsmi, uint32_t cbBuf, VBOXUHGSMI_BUFFER_TYPE_FLAGS fType, PVBOXUHGSMI_BUFFER* ppBuf);
     79typedef DECLCALLBACKTYPE(int, FNVBOXUHGSMI_BUFFER_CREATE,(PVBOXUHGSMI pHgsmi, uint32_t cbBuf, VBOXUHGSMI_BUFFER_TYPE_FLAGS fType,
     80                                                          PVBOXUHGSMI_BUFFER* ppBuf));
    8081typedef FNVBOXUHGSMI_BUFFER_CREATE *PFNVBOXUHGSMI_BUFFER_CREATE;
    8182
    … …  
    8889} VBOXUHGSMI_BUFFER_SUBMIT, *PVBOXUHGSMI_BUFFER_SUBMIT;
    8990
    90 typedef DECLCALLBACK(int) FNVBOXUHGSMI_BUFFER_SUBMIT(PVBOXUHGSMI pHgsmi, PVBOXUHGSMI_BUFFER_SUBMIT aBuffers, uint32_t cBuffers);
     91typedef DECLCALLBACKTYPE(int, FNVBOXUHGSMI_BUFFER_SUBMIT,(PVBOXUHGSMI pHgsmi, PVBOXUHGSMI_BUFFER_SUBMIT aBuffers,
     92                                                          uint32_t cBuffers));
    9193typedef FNVBOXUHGSMI_BUFFER_SUBMIT *PFNVBOXUHGSMI_BUFFER_SUBMIT;
    9294
    93 typedef DECLCALLBACK(int) FNVBOXUHGSMI_BUFFER_DESTROY(PVBOXUHGSMI_BUFFER pBuf);
     95typedef DECLCALLBACKTYPE(int, FNVBOXUHGSMI_BUFFER_DESTROY,(PVBOXUHGSMI_BUFFER pBuf));
    9496typedef FNVBOXUHGSMI_BUFFER_DESTROY *PFNVBOXUHGSMI_BUFFER_DESTROY;
    9597
    96 typedef DECLCALLBACK(int) FNVBOXUHGSMI_BUFFER_LOCK(PVBOXUHGSMI_BUFFER pBuf, uint32_t offLock, uint32_t cbLock, VBOXUHGSMI_BUFFER_LOCK_FLAGS fFlags, void**pvLock);
     98typedef DECLCALLBACKTYPE(int, FNVBOXUHGSMI_BUFFER_LOCK,(PVBOXUHGSMI_BUFFER pBuf, uint32_t offLock, uint32_t cbLock,
     99                                                        VBOXUHGSMI_BUFFER_LOCK_FLAGS fFlags, void**pvLock));
    97100typedef FNVBOXUHGSMI_BUFFER_LOCK *PFNVBOXUHGSMI_BUFFER_LOCK;
    98101
    99 typedef DECLCALLBACK(int) FNVBOXUHGSMI_BUFFER_UNLOCK(PVBOXUHGSMI_BUFFER pBuf);
     102typedef DECLCALLBACKTYPE(int, FNVBOXUHGSMI_BUFFER_UNLOCK,(PVBOXUHGSMI_BUFFER pBuf));
    100103typedef FNVBOXUHGSMI_BUFFER_UNLOCK *PFNVBOXUHGSMI_BUFFER_UNLOCK;
    101104

  • trunk/include/VBox/Graphics/VBoxVideo.h

    r82968 r85121  
    859859} VBOXVHWACMD_HH_SAVESTATE_LOADPERFORM;
    860860
    861 typedef DECLCALLBACK(void) FNVBOXVHWA_HH_CALLBACK(void*);
     861typedef DECLCALLBACKTYPE(void, FNVBOXVHWA_HH_CALLBACK,(void *));
    862862typedef FNVBOXVHWA_HH_CALLBACK *PFNVBOXVHWA_HH_CALLBACK;
    863863

  • trunk/include/VBox/Graphics/VBoxVideo3D.h

    r84740 r85121  
    5050#endif
    5151
    52 typedef DECLCALLBACK(void) FNVBOXTLSREFDTOR(void*);
     52typedef DECLCALLBACKTYPE(void, FNVBOXTLSREFDTOR,(void *));
    5353typedef FNVBOXTLSREFDTOR *PFNVBOXTLSREFDTOR;
    5454

  • trunk/include/VBox/Graphics/VBoxVideoGuest.h

    r82968 r85121  
    145145 * @todo  explicitly pass the array size
    146146 */
    147 typedef DECLCALLBACK(int) FNHGSMIFILLVIEWINFO(void *pvData,
    148                                               struct VBVAINFOVIEW *pInfo,
    149                                               uint32_t cViews);
     147typedef DECLCALLBACKTYPE(int, FNHGSMIFILLVIEWINFO,(void *pvData, struct VBVAINFOVIEW *pInfo, uint32_t cViews));
    150148/** Pointer to a FNHGSMIFILLVIEWINFO callback */
    151149typedef FNHGSMIFILLVIEWINFO *PFNHGSMIFILLVIEWINFO;

  • trunk/include/VBox/GuestHost/SharedClipboard-transfers.h

    r82968 r85121  
    736736typedef struct SHCLPROVIDERINTERFACE
    737737{
    738     DECLCALLBACKMEMBER(int, pfnTransferOpen)(PSHCLPROVIDERCTX pCtx);
    739     DECLCALLBACKMEMBER(int, pfnTransferClose)(PSHCLPROVIDERCTX pCtx);
    740     DECLCALLBACKMEMBER(int, pfnRootsGet)(PSHCLPROVIDERCTX pCtx, PSHCLROOTLIST *ppRootList);
    741     DECLCALLBACKMEMBER(int, pfnListOpen)(PSHCLPROVIDERCTX pCtx, PSHCLLISTOPENPARMS pOpenParms, PSHCLLISTHANDLE phList);
    742     DECLCALLBACKMEMBER(int, pfnListClose)(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList);
    743     DECLCALLBACKMEMBER(int, pfnListHdrRead)(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList, PSHCLLISTHDR pListHdr);
    744     DECLCALLBACKMEMBER(int, pfnListHdrWrite)(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList, PSHCLLISTHDR pListHdr);
    745     DECLCALLBACKMEMBER(int, pfnListEntryRead)(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList, PSHCLLISTENTRY pEntry);
    746     DECLCALLBACKMEMBER(int, pfnListEntryWrite)(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList, PSHCLLISTENTRY pEntry);
    747     DECLCALLBACKMEMBER(int, pfnObjOpen)(PSHCLPROVIDERCTX pCtx, PSHCLOBJOPENCREATEPARMS pCreateParms, PSHCLOBJHANDLE phObj);
    748     DECLCALLBACKMEMBER(int, pfnObjClose)(PSHCLPROVIDERCTX pCtx, SHCLOBJHANDLE hObj);
    749     DECLCALLBACKMEMBER(int, pfnObjRead)(PSHCLPROVIDERCTX pCtx, SHCLOBJHANDLE hObj, void *pvData, uint32_t cbData,
    750                                         uint32_t fFlags, uint32_t *pcbRead);
    751     DECLCALLBACKMEMBER(int, pfnObjWrite)(PSHCLPROVIDERCTX pCtx, SHCLOBJHANDLE hObj, void *pvData, uint32_t cbData,
    752                                          uint32_t fFlags, uint32_t *pcbWritten);
     738    DECLCALLBACKMEMBER(int, pfnTransferOpen,(PSHCLPROVIDERCTX pCtx));
     739    DECLCALLBACKMEMBER(int, pfnTransferClose,(PSHCLPROVIDERCTX pCtx));
     740    DECLCALLBACKMEMBER(int, pfnRootsGet,(PSHCLPROVIDERCTX pCtx, PSHCLROOTLIST *ppRootList));
     741    DECLCALLBACKMEMBER(int, pfnListOpen,(PSHCLPROVIDERCTX pCtx, PSHCLLISTOPENPARMS pOpenParms, PSHCLLISTHANDLE phList));
     742    DECLCALLBACKMEMBER(int, pfnListClose,(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList));
     743    DECLCALLBACKMEMBER(int, pfnListHdrRead,(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList, PSHCLLISTHDR pListHdr));
     744    DECLCALLBACKMEMBER(int, pfnListHdrWrite,(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList, PSHCLLISTHDR pListHdr));
     745    DECLCALLBACKMEMBER(int, pfnListEntryRead,(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList, PSHCLLISTENTRY pEntry));
     746    DECLCALLBACKMEMBER(int, pfnListEntryWrite,(PSHCLPROVIDERCTX pCtx, SHCLLISTHANDLE hList, PSHCLLISTENTRY pEntry));
     747    DECLCALLBACKMEMBER(int, pfnObjOpen,(PSHCLPROVIDERCTX pCtx, PSHCLOBJOPENCREATEPARMS pCreateParms, PSHCLOBJHANDLE phObj));
     748    DECLCALLBACKMEMBER(int, pfnObjClose,(PSHCLPROVIDERCTX pCtx, SHCLOBJHANDLE hObj));
     749    DECLCALLBACKMEMBER(int, pfnObjRead,(PSHCLPROVIDERCTX pCtx, SHCLOBJHANDLE hObj, void *pvData, uint32_t cbData,
     750                                        uint32_t fFlags, uint32_t *pcbRead));
     751    DECLCALLBACKMEMBER(int, pfnObjWrite,(PSHCLPROVIDERCTX pCtx, SHCLOBJHANDLE hObj, void *pvData, uint32_t cbData,
     752                                         uint32_t fFlags, uint32_t *pcbWritten));
    753753} SHCLPROVIDERINTERFACE, *PSHCLPROVIDERINTERFACE;
    754754
    … …  
    792792    size_t cbUser;
    793793    /** Called after the transfer has been initialized. */
    794     DECLCALLBACKMEMBER(int,  pfnTransferInitialize)(PSHCLTRANSFERCALLBACKDATA pData);
     794    DECLCALLBACKMEMBER(int, pfnTransferInitialize,(PSHCLTRANSFERCALLBACKDATA pData));
    795795    /** Called before the transfer will be started. */
    796     DECLCALLBACKMEMBER(int,  pfnTransferStart)(PSHCLTRANSFERCALLBACKDATA pData);
     796    DECLCALLBACKMEMBER(int, pfnTransferStart,(PSHCLTRANSFERCALLBACKDATA pData));
    797797    /** Called when reading / writing the list header is complete. */
    798     DECLCALLBACKMEMBER(void, pfnListHeaderComplete)(PSHCLTRANSFERCALLBACKDATA pData);
     798    DECLCALLBACKMEMBER(void, pfnListHeaderComplete,(PSHCLTRANSFERCALLBACKDATA pData));
    799799    /** Called when reading / writing a list entry is complete. */
    800     DECLCALLBACKMEMBER(void, pfnListEntryComplete)(PSHCLTRANSFERCALLBACKDATA pData);
     800    DECLCALLBACKMEMBER(void, pfnListEntryComplete,(PSHCLTRANSFERCALLBACKDATA pData));
    801801    /** Called when the transfer is complete. */
    802     DECLCALLBACKMEMBER(void, pfnTransferComplete)(PSHCLTRANSFERCALLBACKDATA pData, int rc);
     802    DECLCALLBACKMEMBER(void, pfnTransferComplete,(PSHCLTRANSFERCALLBACKDATA pData, int rc));
    803803    /** Called when the transfer has been canceled. */
    804     DECLCALLBACKMEMBER(void, pfnTransferCanceled)(PSHCLTRANSFERCALLBACKDATA pData);
     804    DECLCALLBACKMEMBER(void, pfnTransferCanceled,(PSHCLTRANSFERCALLBACKDATA pData));
    805805    /** Called when transfer resulted in an unrecoverable error. */
    806     DECLCALLBACKMEMBER(void, pfnTransferError)(PSHCLTRANSFERCALLBACKDATA pData, int rc);
     806    DECLCALLBACKMEMBER(void, pfnTransferError,(PSHCLTRANSFERCALLBACKDATA pData, int rc));
    807807} SHCLTRANSFERCALLBACKS, *PSHCLTRANSFERCALLBACKS;
    808808

  • trunk/include/VBox/GuestHost/SharedClipboard-win.h

    r83624 r85121  
    131131int SharedClipboardWinChainAdd(PSHCLWINCTX pCtx);
    132132int SharedClipboardWinChainRemove(PSHCLWINCTX pCtx);
    133 VOID CALLBACK SharedClipboardWinChainPingProc(HWND hWnd, UINT uMsg, ULONG_PTR dwData, LRESULT lResult);
     133VOID CALLBACK SharedClipboardWinChainPingProc(HWND hWnd, UINT uMsg, ULONG_PTR dwData, LRESULT lResult) RT_NOTHROW_DEF;
    134134LRESULT SharedClipboardWinChainPassToNext(PSHCLWINCTX pWinCtx, UINT msg, WPARAM wParam, LPARAM lParam);
    135135

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

    r82968 r85121  
    182182
    183183template <class T>
    184 class AbstractService: public RTCNonCopyable
    185 {
    186 public:
    187     /**
    188      * @copydoc VBOXHGCMSVCLOAD
     184class AbstractService : public RTCNonCopyable
     185{
     186public:
     187    /**
     188     * @copydoc FNVBOXHGCMSVCLOAD
    189189     */
    190190    static DECLCALLBACK(int) svcLoad(VBOXHGCMSVCFNTABLE *pTable)

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

    r82968 r85121  
    5252#define VBOX_CLIPBOARD_EXT_FN_AREA_DETACH          (7)
    5353
    54 typedef DECLCALLBACK(int) VRDPCLIPBOARDEXTCALLBACK (uint32_t u32Function, uint32_t u32Format, void *pvData, uint32_t cbData);
    55 typedef VRDPCLIPBOARDEXTCALLBACK *PFNVRDPCLIPBOARDEXTCALLBACK;
     54typedef DECLCALLBACKTYPE(int, FNVRDPCLIPBOARDEXTCALLBACK,(uint32_t u32Function, uint32_t u32Format, void *pvData, uint32_t cbData));
     55typedef FNVRDPCLIPBOARDEXTCALLBACK *PFNVRDPCLIPBOARDEXTCALLBACK;
    5656
    5757typedef struct _SHCLEXTPARMS

  • trunk/include/VBox/RemoteDesktop/VRDE.h

    r82968 r85121  
    15701570 */
    15711571DECLEXPORT(int) VRDECreateServer (const VRDEINTERFACEHDR *pCallbacks,
    1572                                     void *pvCallback,
    1573                                     VRDEINTERFACEHDR **ppEntryPoints,
    1574                                     HVRDESERVER *phServer);
    1575 
    1576 typedef DECLCALLBACK(int) FNVRDECREATESERVER (const VRDEINTERFACEHDR *pCallbacks,
    1577                                               void *pvCallback,
    1578                                               VRDEINTERFACEHDR **ppEntryPoints,
    1579                                               HVRDESERVER *phServer);
     1572                                  void *pvCallback,
     1573                                  VRDEINTERFACEHDR **ppEntryPoints,
     1574                                  HVRDESERVER *phServer);
     1575
     1576typedef DECLCALLBACKTYPE(int, FNVRDECREATESERVER,(const VRDEINTERFACEHDR *pCallbacks,
     1577                                                  void *pvCallback,
     1578                                                  VRDEINTERFACEHDR **ppEntryPoints,
     1579                                                  HVRDESERVER *phServer));
    15801580typedef FNVRDECREATESERVER *PFNVRDECREATESERVER;
    15811581
    … …  
    15961596DECLEXPORT(const char * const *) VRDESupportedProperties (void);
    15971597
    1598 typedef DECLCALLBACK(const char * const *) FNVRDESUPPORTEDPROPERTIES (void);
     1598typedef DECLCALLBACKTYPE(const char * const *, FNVRDESUPPORTEDPROPERTIES,(void));
    15991599typedef FNVRDESUPPORTEDPROPERTIES *PFNVRDESUPPORTEDPROPERTIES;
    16001600

  • trunk/include/VBox/VBoxDrvCfg-win.h

    r82968 r85121  
    5555} VBOXDRVCFG_LOG_SEVERITY;
    5656
    57 typedef DECLCALLBACK(void) FNVBOXDRVCFG_LOG(VBOXDRVCFG_LOG_SEVERITY enmSeverity, char *pszMsg, void *pvContext);
     57typedef DECLCALLBACKTYPE(void, FNVBOXDRVCFG_LOG,(VBOXDRVCFG_LOG_SEVERITY enmSeverity, char *pszMsg, void *pvContext));
    5858typedef FNVBOXDRVCFG_LOG *PFNVBOXDRVCFG_LOG;
    5959
    6060VBOXDRVCFG_DECL(void) VBoxDrvCfgLoggerSet(PFNVBOXDRVCFG_LOG pfnLog, void *pvLog);
    6161
    62 typedef DECLCALLBACK(void) FNVBOXDRVCFG_PANIC(void * pvPanic);
     62typedef DECLCALLBACKTYPE(void, FNVBOXDRVCFG_PANIC,(void *pvPanic));
    6363typedef FNVBOXDRVCFG_PANIC *PFNVBOXDRVCFG_PANIC;
    6464VBOXDRVCFG_DECL(void) VBoxDrvCfgPanicSet(PFNVBOXDRVCFG_PANIC pfnPanic, void *pvPanic);

  • trunk/include/VBox/VBoxGuest.h

    r85024 r85121  
    819819     */
    820820# if ARCH_BITS == 32 || defined(DOXYGEN_RUNNING)
    821     DECLCALLBACKMEMBER(int, pfnServiceEP)(uint32_t u32Session, unsigned iFunction, PVBGLREQHDR pReqHdr, size_t cbReq);
     821    DECLCALLBACKMEMBER(int, pfnServiceEP,(uint32_t u32Session, unsigned iFunction, PVBGLREQHDR pReqHdr, size_t cbReq));
    822822# else
    823823    uint32_t pfnServiceEP;
    … …  
    836836     */
    837837# if ARCH_BITS == 16 || defined(DOXYGEN_RUNNING)
    838     DECLCALLBACKMEMBER(int, fpfnServiceEP)(uint32_t u32Session, uint16_t iFunction, PVBGLREQHDR fpvData, uint16_t cbData);
     838    DECLCALLBACKMEMBER(int, fpfnServiceEP,(uint32_t u32Session, uint16_t iFunction, PVBGLREQHDR fpvData, uint16_t cbData));
    839839# else
    840840    RTFAR16 fpfnServiceEP;

  • trunk/include/VBox/VBoxGuestCoreTypes.h

    r82968 r85121  
    229229 * @param   pvUser      Argument given when setting the callback.
    230230 */
    231 typedef DECLCALLBACK(void) FNVBOXGUESTMOUSENOTIFY(void *pvUser);
     231typedef DECLCALLBACKTYPE(void, FNVBOXGUESTMOUSENOTIFY,(void *pvUser));
    232232/** Pointer to a mouse event notification callback function. */
    233233typedef FNVBOXGUESTMOUSENOTIFY *PFNVBOXGUESTMOUSENOTIFY; /**< @todo fix type prefix */

  • trunk/include/VBox/VBoxGuestLib.h

    r85099 r85121  
    243243 * @param   u32Data     VBoxGuest 32 bit value to be passed to callback.
    244244 */
    245 typedef DECLCALLBACK(int) FNVBGLHGCMCALLBACK(VMMDevHGCMRequestHeader *pHeader, void *pvData, uint32_t u32Data);
     245typedef DECLCALLBACKTYPE(int, FNVBGLHGCMCALLBACK,(VMMDevHGCMRequestHeader *pHeader, void *pvData, uint32_t u32Data));
    246246/** Pointer to a FNVBGLHGCMCALLBACK. */
    247247typedef FNVBGLHGCMCALLBACK *PFNVBGLHGCMCALLBACK;

  • trunk/include/VBox/VBoxNetCfg-win.h

    r82968 r85121  
    122122
    123123
    124 typedef VOID (*LOG_ROUTINE)(LPCSTR szString); /**< I'm not prefixed. */
    125 VBOXNETCFGWIN_DECL(VOID) VBoxNetCfgWinSetLogging(IN LOG_ROUTINE pfnLog);
     124typedef DECLCALLBACKTYPE(void, FNVBOXNETCFGLOGGER,(const char *pszString));
     125typedef FNVBOXNETCFGLOGGER *PFNVBOXNETCFGLOGGER;
     126VBOXNETCFGWIN_DECL(void) VBoxNetCfgWinSetLogging(IN PFNVBOXNETCFGLOGGER pfnLogger);
    126127
    127128RT_C_DECLS_END

  • trunk/include/VBox/dbg.h

    r82968 r85121  
    423423     * @param   ...         Arguments specified in the format string.
    424424     */
    425     DECLCALLBACKMEMBER(int, pfnPrintf)(PDBGCCMDHLP pCmdHlp, size_t *pcbWritten,
    426                                        const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(3, 4);
     425    DECLCALLBACKMEMBER(int, pfnPrintf,(PDBGCCMDHLP pCmdHlp, size_t *pcbWritten,
     426                                       const char *pszFormat, ...)) RT_IPRT_FORMAT_ATTR(3, 4);
    427427
    428428    /**
    … …  
    437437     * @param   args        Arguments specified in the format string.
    438438     */
    439     DECLCALLBACKMEMBER(int, pfnPrintfV)(PDBGCCMDHLP pCmdHlp, size_t *pcbWritten,
    440                                         const char *pszFormat, va_list args) RT_IPRT_FORMAT_ATTR(3, 0);
     439    DECLCALLBACKMEMBER(int, pfnPrintfV,(PDBGCCMDHLP pCmdHlp, size_t *pcbWritten,
     440                                        const char *pszFormat, va_list args)) RT_IPRT_FORMAT_ATTR(3, 0);
    441441
    442442    /**
    … …  
    451451     * @param   ...         Arguments specified in the format string.
    452452     */
    453     DECLCALLBACKMEMBER(size_t, pfnStrPrintf)(PDBGCCMDHLP pCmdHlp, char *pszBuf, size_t cbBuf,
    454                                              const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(4, 5);
     453    DECLCALLBACKMEMBER(size_t, pfnStrPrintf,(PDBGCCMDHLP pCmdHlp, char *pszBuf, size_t cbBuf,
     454                                             const char *pszFormat, ...)) RT_IPRT_FORMAT_ATTR(4, 5);
    455455
    456456    /**
    … …  
    465465     * @param   va          Arguments specified in the format string.
    466466     */
    467     DECLCALLBACKMEMBER(size_t, pfnStrPrintfV)(PDBGCCMDHLP pCmdHlp, char *pszBuf, size_t cbBuf,
    468                                               const char *pszFormat, va_list va) RT_IPRT_FORMAT_ATTR(4, 0);
     467    DECLCALLBACKMEMBER(size_t, pfnStrPrintfV,(PDBGCCMDHLP pCmdHlp, char *pszBuf, size_t cbBuf,
     468                                              const char *pszFormat, va_list va)) RT_IPRT_FORMAT_ATTR(4, 0);
    469469
    470470    /**
    … …  
    477477     * @param   ...         Format arguments, optional.
    478478     */
    479     DECLCALLBACKMEMBER(int, pfnVBoxError)(PDBGCCMDHLP pCmdHlp, int rc, const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(3, 4);
     479    DECLCALLBACKMEMBER(int, pfnVBoxError,(PDBGCCMDHLP pCmdHlp, int rc, const char *pszFormat, ...)) RT_IPRT_FORMAT_ATTR(3, 4);
    480480
    481481    /**
    … …  
    488488     * @param   args        Format arguments, optional.
    489489     */
    490     DECLCALLBACKMEMBER(int, pfnVBoxErrorV)(PDBGCCMDHLP pCmdHlp, int rc,
    491                                            const char *pszFormat, va_list args) RT_IPRT_FORMAT_ATTR(3, 0);
     490    DECLCALLBACKMEMBER(int, pfnVBoxErrorV,(PDBGCCMDHLP pCmdHlp, int rc,
     491                                           const char *pszFormat, va_list args)) RT_IPRT_FORMAT_ATTR(3, 0);
    492492
    493493    /**
    … …  
    505505     *                      will cause failure.
    506506     */
    507     DECLCALLBACKMEMBER(int, pfnMemRead)(PDBGCCMDHLP pCmdHlp, void *pvBuffer, size_t cbRead, PCDBGCVAR pVarPointer, size_t *pcbRead);
     507    DECLCALLBACKMEMBER(int, pfnMemRead,(PDBGCCMDHLP pCmdHlp, void *pvBuffer, size_t cbRead, PCDBGCVAR pVarPointer, size_t *pcbRead));
    508508
    509509    /**
    … …  
    519519     *                      might have been written to the specified address.
    520520     */
    521     DECLCALLBACKMEMBER(int, pfnMemWrite)(PDBGCCMDHLP pCmdHlp, const void *pvBuffer, size_t cbWrite, PCDBGCVAR pVarPointer, size_t *pcbWritten);
     521    DECLCALLBACKMEMBER(int, pfnMemWrite,(PDBGCCMDHLP pCmdHlp, const void *pvBuffer, size_t cbWrite, PCDBGCVAR pVarPointer, size_t *pcbWritten));
    522522
    523523    /**
    … …  
    530530     * @param   ...         Format arguments.
    531531     */
    532     DECLCALLBACKMEMBER(int, pfnExec)(PDBGCCMDHLP pCmdHlp, const char *pszExpr, ...) RT_IPRT_FORMAT_ATTR(2, 3);
     532    DECLCALLBACKMEMBER(int, pfnExec,(PDBGCCMDHLP pCmdHlp, const char *pszExpr, ...)) RT_IPRT_FORMAT_ATTR(2, 3);
    533533
    534534    /**
    … …  
    542542     * @param   va          Format arguments.
    543543     */
    544     DECLCALLBACKMEMBER(int, pfnEvalV)(PDBGCCMDHLP pCmdHlp, PDBGCVAR pResult,
    545                                       const char *pszExpr, va_list va) RT_IPRT_FORMAT_ATTR(3, 0);
     544    DECLCALLBACKMEMBER(int, pfnEvalV,(PDBGCCMDHLP pCmdHlp, PDBGCVAR pResult,
     545                                      const char *pszExpr, va_list va)) RT_IPRT_FORMAT_ATTR(3, 0);
    546546
    547547    /**
    … …  
    555555     * @param   va          Format arguments.
    556556     */
    557     DECLCALLBACKMEMBER(int, pfnFailV)(PDBGCCMDHLP pCmdHlp, PCDBGCCMD pCmd,
    558                                       const char *pszFormat, va_list va) RT_IPRT_FORMAT_ATTR(3, 0);
     557    DECLCALLBACKMEMBER(int, pfnFailV,(PDBGCCMDHLP pCmdHlp, PCDBGCCMD pCmd,
     558                                      const char *pszFormat, va_list va)) RT_IPRT_FORMAT_ATTR(3, 0);
    559559
    560560    /**
    … …  
    572572     * @see     DBGCCmdHlpFailRc
    573573     */
    574     DECLCALLBACKMEMBER(int, pfnFailRcV)(PDBGCCMDHLP pCmdHlp, PCDBGCCMD pCmd, int rc,
    575                                         const char *pszFormat, va_list va) RT_IPRT_FORMAT_ATTR(4, 0);
     574    DECLCALLBACKMEMBER(int, pfnFailRcV,(PDBGCCMDHLP pCmdHlp, PCDBGCCMD pCmd, int rc,
     575                                        const char *pszFormat, va_list va)) RT_IPRT_FORMAT_ATTR(4, 0);
    576576
    577577    /**
    … …  
    586586     * @param   iLine       The line number.
    587587     */
    588     DECLCALLBACKMEMBER(int, pfnParserError)(PDBGCCMDHLP pCmdHlp, PCDBGCCMD pCmd, int iArg, const char *pszExpr, unsigned iLine);
     588    DECLCALLBACKMEMBER(int, pfnParserError,(PDBGCCMDHLP pCmdHlp, PCDBGCCMD pCmd, int iArg, const char *pszExpr, unsigned iLine));
    589589
    590590    /**
    … …  
    596596     * @param   pAddress    The target address.
    597597     */
    598     DECLCALLBACKMEMBER(int, pfnVarToDbgfAddr)(PDBGCCMDHLP pCmdHlp, PCDBGCVAR pVar, PDBGFADDRESS pAddress);
     598    DECLCALLBACKMEMBER(int, pfnVarToDbgfAddr,(PDBGCCMDHLP pCmdHlp, PCDBGCVAR pVar, PDBGFADDRESS pAddress));
    599599
    600600    /**
    … …  
    606606     * @param   pResult     The result variable.
    607607     */
    608     DECLCALLBACKMEMBER(int, pfnVarFromDbgfAddr)(PDBGCCMDHLP pCmdHlp, PCDBGFADDRESS pAddress, PDBGCVAR pResult);
     608    DECLCALLBACKMEMBER(int, pfnVarFromDbgfAddr,(PDBGCCMDHLP pCmdHlp, PCDBGFADDRESS pAddress, PDBGCVAR pResult));
    609609
    610610    /**
    … …  
    616616     * @param   pu64Number  Where to store the number.
    617617     */
    618     DECLCALLBACKMEMBER(int, pfnVarToNumber)(PDBGCCMDHLP pCmdHlp, PCDBGCVAR pVar, uint64_t *pu64Number);
     618    DECLCALLBACKMEMBER(int, pfnVarToNumber,(PDBGCCMDHLP pCmdHlp, PCDBGCVAR pVar, uint64_t *pu64Number));
    619619
    620620    /**
    … …  
    626626     * @param   pf          Where to store the boolean.
    627627     */
    628     DECLCALLBACKMEMBER(int, pfnVarToBool)(PDBGCCMDHLP pCmdHlp, PCDBGCVAR pVar, bool *pf);
     628    DECLCALLBACKMEMBER(int, pfnVarToBool,(PDBGCCMDHLP pCmdHlp, PCDBGCVAR pVar, bool *pf));
    629629
    630630    /**
    … …  
    638638     * @param   pcbRange    The length of the range.
    639639     */
    640     DECLCALLBACKMEMBER(int, pfnVarGetRange)(PDBGCCMDHLP pCmdHlp, PCDBGCVAR pVar, uint64_t cbElement, uint64_t cbDefault,
    641                                             uint64_t *pcbRange);
     640    DECLCALLBACKMEMBER(int, pfnVarGetRange,(PDBGCCMDHLP pCmdHlp, PCDBGCVAR pVar, uint64_t cbElement, uint64_t cbDefault,
     641                                            uint64_t *pcbRange));
    642642
    643643    /**
    … …  
    653653     * @param   pResult     The output variable. Can be the same as @a pVar.
    654654     */
    655     DECLCALLBACKMEMBER(int, pfnVarConvert)(PDBGCCMDHLP pCmdHlp, PCDBGCVAR pVar, DBGCVARTYPE enmToType, bool fConvSyms,
    656                                            PDBGCVAR pResult);
     655    DECLCALLBACKMEMBER(int, pfnVarConvert,(PDBGCCMDHLP pCmdHlp, PCDBGCVAR pVar, DBGCVARTYPE enmToType, bool fConvSyms,
     656                                           PDBGCVAR pResult));
    657657
    658658    /**
    … …  
    663663     * @param   pCmdHlp     Pointer to the command callback structure.
    664664     */
    665     DECLCALLBACKMEMBER(PCDBGFINFOHLP, pfnGetDbgfOutputHlp)(PDBGCCMDHLP pCmdHlp);
     665    DECLCALLBACKMEMBER(PCDBGFINFOHLP, pfnGetDbgfOutputHlp,(PDBGCCMDHLP pCmdHlp));
    666666
    667667    /**
    … …  
    671671     * @param   pCmdHlp     Pointer to the command callback structure.
    672672     */
    673     DECLCALLBACKMEMBER(VMCPUID, pfnGetCurrentCpu)(PDBGCCMDHLP pCmdHlp);
     673    DECLCALLBACKMEMBER(VMCPUID, pfnGetCurrentCpu,(PDBGCCMDHLP pCmdHlp));
    674674
    675675    /**
    … …  
    680680     * @param   pCmdHlp     Pointer to the command callback structure.
    681681     */
    682     DECLCALLBACKMEMBER(CPUMMODE, pfnGetCpuMode)(PDBGCCMDHLP pCmdHlp);
     682    DECLCALLBACKMEMBER(CPUMMODE, pfnGetCpuMode,(PDBGCCMDHLP pCmdHlp));
    683683
    684684    /** End marker (DBGCCMDHLP_MAGIC). */
    … …  
    10021002 * @param   cArgs       Number of arguments in the array.
    10031003 */
    1004 typedef DECLCALLBACK(int) FNDBGCCMD(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PUVM pUVM, PCDBGCVAR paArgs, unsigned cArgs);
     1004typedef DECLCALLBACKTYPE(int, FNDBGCCMD,(PCDBGCCMD pCmd, PDBGCCMDHLP pCmdHlp, PUVM pUVM, PCDBGCVAR paArgs, unsigned cArgs));
    10051005/** Pointer to a FNDBGCCMD() function. */
    10061006typedef FNDBGCCMD *PFNDBGCCMD;
    … …  
    10521052 * @param   pResult     Where to return the result.
    10531053 */
    1054 typedef DECLCALLBACK(int) FNDBGCFUNC(PCDBGCFUNC pFunc, PDBGCCMDHLP pCmdHlp, PUVM pUVM, PCDBGCVAR paArgs, unsigned cArgs,
    1055                                      PDBGCVAR pResult);
     1054typedef DECLCALLBACKTYPE(int, FNDBGCFUNC,(PCDBGCFUNC pFunc, PDBGCCMDHLP pCmdHlp, PUVM pUVM, PCDBGCVAR paArgs, unsigned cArgs,
     1055                                          PDBGCVAR pResult));
    10561056/** Pointer to a FNDBGCFUNC() function. */
    10571057typedef FNDBGCFUNC *PFNDBGCFUNC;
    … …  
    10971097 * @param   cMillies    Number of milliseconds to wait on input data.
    10981098 */
    1099 typedef DECLCALLBACK(bool) FNDBGCBACKINPUT(PDBGCBACK pBack, uint32_t cMillies);
     1099typedef DECLCALLBACKTYPE(bool, FNDBGCBACKINPUT,(PDBGCBACK pBack, uint32_t cMillies));
    11001100/** Pointer to a FNDBGCBACKINPUT() callback. */
    11011101typedef FNDBGCBACKINPUT *PFNDBGCBACKINPUT;
    … …  
    11141114 *                      successful return.
    11151115 */
    1116 typedef DECLCALLBACK(int) FNDBGCBACKREAD(PDBGCBACK pBack, void *pvBuf, size_t cbBuf, size_t *pcbRead);
     1116typedef DECLCALLBACKTYPE(int, FNDBGCBACKREAD,(PDBGCBACK pBack, void *pvBuf, size_t cbBuf, size_t *pcbRead));
    11171117/** Pointer to a FNDBGCBACKREAD() callback. */
    11181118typedef FNDBGCBACKREAD *PFNDBGCBACKREAD;
    … …  
    11301130 *                      If NULL the entire buffer must be successfully written.
    11311131 */
    1132 typedef DECLCALLBACK(int) FNDBGCBACKWRITE(PDBGCBACK pBack, const void *pvBuf, size_t cbBuf, size_t *pcbWritten);
     1132typedef DECLCALLBACKTYPE(int, FNDBGCBACKWRITE,(PDBGCBACK pBack, const void *pvBuf, size_t cbBuf, size_t *pcbWritten));
    11331133/** Pointer to a FNDBGCBACKWRITE() callback. */
    11341134typedef FNDBGCBACKWRITE *PFNDBGCBACKWRITE;
    … …  
    11421142 * @param   fReady      Whether it's ready (true) or busy (false).
    11431143 */
    1144 typedef DECLCALLBACK(void) FNDBGCBACKSETREADY(PDBGCBACK pBack, bool fReady);
     1144typedef DECLCALLBACKTYPE(void, FNDBGCBACKSETREADY,(PDBGCBACK pBack, bool fReady));
    11451145/** Pointer to a FNDBGCBACKSETREADY() callback. */
    11461146typedef FNDBGCBACKSETREADY *PFNDBGCBACKSETREADY;

  • trunk/include/VBox/dbggui.h

    r82968 r85121  
    5555    uint32_t u32Version;
    5656    /** @copydoc DBGGuiDestroy */
    57     DECLCALLBACKMEMBER(int,  pfnDestroy)(PDBGGUI pGui);
     57    DECLCALLBACKMEMBER(int, pfnDestroy,(PDBGGUI pGui));
    5858    /** @copydoc DBGGuiAdjustRelativePos */
    59     DECLCALLBACKMEMBER(void, pfnAdjustRelativePos)(PDBGGUI pGui, int x, int y, unsigned cx, unsigned cy);
     59    DECLCALLBACKMEMBER(void, pfnAdjustRelativePos,(PDBGGUI pGui, int x, int y, unsigned cx, unsigned cy));
    6060    /** @copydoc DBGGuiShowStatistics */
    61     DECLCALLBACKMEMBER(int,  pfnShowStatistics)(PDBGGUI pGui);
     61    DECLCALLBACKMEMBER(int, pfnShowStatistics,(PDBGGUI pGui));
    6262    /** @copydoc DBGGuiShowCommandLine */
    63     DECLCALLBACKMEMBER(int,  pfnShowCommandLine)(PDBGGUI pGui);
     63    DECLCALLBACKMEMBER(int, pfnShowCommandLine,(PDBGGUI pGui));
    6464    /** @copydoc DBGGuiSetParent */
    65     DECLCALLBACKMEMBER(void, pfnSetParent)(PDBGGUI pGui, void *pvParent);
     65    DECLCALLBACKMEMBER(void, pfnSetParent,(PDBGGUI pGui, void *pvParent));
    6666    /** @copydoc DBGGuiSetMenu */
    67     DECLCALLBACKMEMBER(void, pfnSetMenu)(PDBGGUI pGui, void *pvMenu);
     67    DECLCALLBACKMEMBER(void, pfnSetMenu,(PDBGGUI pGui, void *pvMenu));
    6868    /** The end version. (DBGGUIVT_VERSION) */
    6969    uint32_t u32EndVersion;
    … …  
    9595DBGDECL(int) DBGGuiCreate(ISession *pSession, PDBGGUI *ppGui, PCDBGGUIVT *ppGuiVT);
    9696/** @copydoc DBGGuiCreate */
    97 typedef DECLCALLBACK(int) FNDBGGUICREATE(ISession *pSession, PDBGGUI *ppGui, PCDBGGUIVT *ppGuiVT);
     97typedef DECLCALLBACKTYPE(int, FNDBGGUICREATE,(ISession *pSession, PDBGGUI *ppGui, PCDBGGUIVT *ppGuiVT));
    9898/** Pointer to DBGGuiCreate. */
    9999typedef FNDBGGUICREATE *PFNDBGGUICREATE;
    … …  
    110110DBGDECL(int) DBGGuiCreateForVM(PUVM pUVM, PDBGGUI *ppGui, PCDBGGUIVT *ppGuiVT);
    111111/** @copydoc DBGGuiCreateForVM */
    112 typedef DECLCALLBACK(int) FNDBGGUICREATEFORVM(PUVM pUVM, PDBGGUI *ppGui, PCDBGGUIVT *ppGuiVT);
     112typedef DECLCALLBACKTYPE(int, FNDBGGUICREATEFORVM,(PUVM pUVM, PDBGGUI *ppGui, PCDBGGUIVT *ppGuiVT));
    113113/** Pointer to DBGGuiCreateForVM. */
    114114typedef FNDBGGUICREATEFORVM *PFNDBGGUICREATEFORVM;

  • trunk/include/VBox/dis.h

    r82968 r85121  
    539539 * @param   cbMaxRead       The maximum number of bytes that may be read.
    540540 */
    541 typedef DECLCALLBACK(int) FNDISREADBYTES(PDISSTATE pDis, uint8_t offInstr, uint8_t cbMinRead, uint8_t cbMaxRead);
     541typedef DECLCALLBACKTYPE(int, FNDISREADBYTES,(PDISSTATE pDis, uint8_t offInstr, uint8_t cbMinRead, uint8_t cbMaxRead));
    542542/** Pointer to a opcode byte reader. */
    543543typedef FNDISREADBYTES *PFNDISREADBYTES;
    … …  
    765765 * @param   pvUser      The user argument.
    766766 */
    767 typedef DECLCALLBACK(int) FNDISGETSYMBOL(PCDISSTATE pDis, uint32_t u32Sel, RTUINTPTR uAddress, char *pszBuf, size_t cchBuf, RTINTPTR *poff, void *pvUser);
     767typedef DECLCALLBACKTYPE(int, FNDISGETSYMBOL,(PCDISSTATE pDis, uint32_t u32Sel, RTUINTPTR uAddress, char *pszBuf, size_t cchBuf,
     768                                              RTINTPTR *poff, void *pvUser));
    768769/** Pointer to a FNDISGETSYMBOL(). */
    769770typedef FNDISGETSYMBOL *PFNDISGETSYMBOL;

  • trunk/include/VBox/hgcmsvc.h

    r82968 r85121  
    576576 * @param cbParm      The size of the function parameters.
    577577 */
    578 typedef DECLCALLBACK(int) FNHGCMSVCEXT(void *pvExtension, uint32_t u32Function, void *pvParm, uint32_t cbParms);
     578typedef DECLCALLBACKTYPE(int, FNHGCMSVCEXT,(void *pvExtension, uint32_t u32Function, void *pvParm, uint32_t cbParms));
    579579typedef FNHGCMSVCEXT *PFNHGCMSVCEXT;
    580580
    … …  
    688688
    689689/** Service initialization entry point. */
    690 typedef DECLCALLBACK(int) VBOXHGCMSVCLOAD(VBOXHGCMSVCFNTABLE *ptable);
    691 typedef VBOXHGCMSVCLOAD *PFNVBOXHGCMSVCLOAD;
     690typedef DECLCALLBACKTYPE(int, FNVBOXHGCMSVCLOAD,(VBOXHGCMSVCFNTABLE *ptable));
     691typedef FNVBOXHGCMSVCLOAD *PFNVBOXHGCMSVCLOAD;
    692692#define VBOX_HGCM_SVCLOAD_NAME "VBoxHGCMSvcLoad"
    693693

  • trunk/include/VBox/intnet.h

    r82968 r85121  
    420420 * @param   pIfPort     Pointer to the INTNETTRUNKIFPORT instance.
    421421 */
    422 typedef DECLCALLBACK(void) FNINTNETTRUNKIFPORTRELEASEBUSY(PINTNETTRUNKIFPORT pIfPort);
     422typedef DECLCALLBACKTYPE(void, FNINTNETTRUNKIFPORTRELEASEBUSY,(PINTNETTRUNKIFPORT pIfPort));
    423423/** Pointer to a FNINTNETTRUNKIFPORTRELEASEBUSY function. */
    424424typedef FNINTNETTRUNKIFPORTRELEASEBUSY *PFNINTNETTRUNKIFPORTRELEASEBUSY;

  • trunk/include/VBox/rawpci.h

    r82968 r85121  
    8888 *                          or unmapped).
    8989 */
    90 typedef DECLCALLBACK(int) FNRAWPCICONTIGPHYSMEMINFO(struct RAWPCIPERVM *pVmData, RTHCPHYS HCPhysStart,
    91                                                     RTGCPHYS GCPhysStart, uint64_t cbMem, PCIRAWMEMINFOACTION enmAction);
     90typedef DECLCALLBACKTYPE(int, FNRAWPCICONTIGPHYSMEMINFO,(struct RAWPCIPERVM *pVmData, RTHCPHYS HCPhysStart,
     91                                                         RTGCPHYS GCPhysStart, uint64_t cbMem, PCIRAWMEMINFOACTION enmAction));
    9292typedef FNRAWPCICONTIGPHYSMEMINFO *PFNRAWPCICONTIGPHYSMEMINFO;
    9393
    … …  
    348348 * @param   iIrq            Interrupt number.
    349349 */
    350 typedef DECLCALLBACK(bool) FNRAWPCIISR(void *pvContext, int32_t iIrq);
     350typedef DECLCALLBACKTYPE(bool, FNRAWPCIISR,(void *pvContext, int32_t iIrq));
    351351typedef FNRAWPCIISR *PFNRAWPCIISR;
    352352

  • trunk/include/VBox/sup.h

    r85093 r85121  
    11141114 * @param   envp            The environment vector.
    11151115 */
    1116 typedef DECLCALLBACK(int) FNSUPTRUSTEDMAIN(int argc, char **argv, char **envp);
     1116typedef DECLCALLBACKTYPE(int, FNSUPTRUSTEDMAIN,(int argc, char **argv, char **envp));
    11171117/** Pointer to FNSUPTRUSTEDMAIN(). */
    11181118typedef FNSUPTRUSTEDMAIN *PFNSUPTRUSTEDMAIN;
    … …  
    11511151 * @param   va              The message format arguments.
    11521152 */
    1153 typedef DECLCALLBACK(void) FNSUPTRUSTEDERROR(const char *pszWhere, SUPINITOP enmWhat, int rc,
    1154                                              const char *pszMsgFmt, va_list va) RT_IPRT_FORMAT_ATTR(4, 0);
     1153typedef DECLCALLBACKTYPE(void, FNSUPTRUSTEDERROR,(const char *pszWhere, SUPINITOP enmWhat, int rc,
     1154                                                  const char *pszMsgFmt, va_list va)) RT_IPRT_FORMAT_ATTR(4, 0);
    11551155/** Pointer to FNSUPTRUSTEDERROR. */
    11561156typedef FNSUPTRUSTEDERROR *PFNSUPTRUSTEDERROR;
    … …  
    19691969 * @param   pvUser2     The second user argument.
    19701970 */
    1971 typedef DECLCALLBACK(void) FNSUPDRVDESTRUCTOR(void *pvObj, void *pvUser1, void *pvUser2);
     1971typedef DECLCALLBACKTYPE(void, FNSUPDRVDESTRUCTOR,(void *pvObj, void *pvUser1, void *pvUser2));
    19721972/** Pointer to a FNSUPDRVDESTRUCTOR(). */
    19731973typedef FNSUPDRVDESTRUCTOR *PFNSUPDRVDESTRUCTOR;
    … …  
    24342434 * @param   pReqHdr     The request header. Input / Output. Optional.
    24352435 */
    2436 typedef DECLCALLBACK(int) FNSUPR0SERVICEREQHANDLER(PSUPDRVSESSION pSession, uint32_t uOperation,
    2437                                                    uint64_t u64Arg, PSUPR0SERVICEREQHDR pReqHdr);
     2436typedef DECLCALLBACKTYPE(int, FNSUPR0SERVICEREQHANDLER,(PSUPDRVSESSION pSession, uint32_t uOperation,
     2437                                                        uint64_t u64Arg, PSUPR0SERVICEREQHDR pReqHdr));
    24382438/** Pointer to a FNR0SERVICEREQHANDLER(). */
    24392439typedef R0PTRTYPE(FNSUPR0SERVICEREQHANDLER *) PFNSUPR0SERVICEREQHANDLER;

  • trunk/include/VBox/vd-ifs-internal.h

    r82968 r85121  
    4040
    4141/**
     42 * Read data callback.
     43 *
     44 * @return  VBox status code.
     45 * @return  VERR_VD_NOT_OPENED if no image is opened in HDD container.
     46 * @param   pvUser          The opaque data passed for the operation.
     47 * @param   uOffset         Offset of first reading byte from start of disk.
     48 *                          Must be aligned to a sector boundary.
     49 * @param   pvBuffer        Pointer to buffer for reading data.
     50 * @param   cbBuffer        Number of bytes to read.
     51 *                          Must be aligned to a sector boundary.
     52 */
     53typedef DECLCALLBACKTYPE(int, FNVDPARENTREAD,(void *pvUser, uint64_t uOffset, void *pvBuffer, size_t cbBuffer));
     54/** Pointer to a FNVDPARENTREAD. */
     55typedef FNVDPARENTREAD *PFNVDPARENTREAD;
     56
     57/**
    4258 * Interface to get the parent state.
    4359 *
    … …  
    5066     * Common interface header.
    5167     */
    52     VDINTERFACE    Core;
    53 
    54     /**
    55      * Read data callback.
    56      *
    57      * @return  VBox status code.
    58      * @return  VERR_VD_NOT_OPENED if no image is opened in HDD container.
    59      * @param   pvUser          The opaque data passed for the operation.
    60      * @param   uOffset         Offset of first reading byte from start of disk.
    61      *                          Must be aligned to a sector boundary.
    62      * @param   pvBuffer        Pointer to buffer for reading data.
    63      * @param   cbBuffer        Number of bytes to read.
    64      *                          Must be aligned to a sector boundary.
    65      */
    66     DECLR3CALLBACKMEMBER(int, pfnParentRead, (void *pvUser, uint64_t uOffset, void *pvBuffer, size_t cbBuffer));
     68    VDINTERFACE     Core;
     69
     70    /**
     71     * Read data callback, see FNVDPARENTREAD for details.
     72     */
     73    PFNVDPARENTREAD pfnParentRead;
    6774
    6875} VDINTERFACEPARENTSTATE, *PVDINTERFACEPARENTSTATE;
    … …  
    107114 * @param   rcReq           Status code for the completed request.
    108115 */
    109 typedef DECLCALLBACK(int) FNVDXFERCOMPLETED(void *pBackendData, PVDIOCTX pIoCtx, void *pvUser, int rcReq);
     116typedef DECLCALLBACKTYPE(int, FNVDXFERCOMPLETED,(void *pBackendData, PVDIOCTX pIoCtx, void *pvUser, int rcReq));
    110117/** Pointer to FNVDXFERCOMPLETED() */
    111118typedef FNVDXFERCOMPLETED *PFNVDXFERCOMPLETED;

  • trunk/include/VBox/vd-ifs.h

    r82968 r85121  
    333333 * @param   rcReq           Status code of the completed request.
    334334 */
    335 typedef DECLCALLBACK(int) FNVDCOMPLETED(void *pvUser, int rcReq);
     335typedef DECLCALLBACKTYPE(int, FNVDCOMPLETED,(void *pvUser, int rcReq));
    336336/** Pointer to FNVDCOMPLETED() */
    337337typedef FNVDCOMPLETED *PFNVDCOMPLETED;
    … …  
    711711 * @param   uPercentage     Completion percentage.
    712712 */
    713 typedef DECLCALLBACK(int) FNVDPROGRESS(void *pvUser, unsigned uPercentage);
     713typedef DECLCALLBACKTYPE(int, FNVDPROGRESS,(void *pvUser, unsigned uPercentage));
    714714/** Pointer to FNVDPROGRESS() */
    715715typedef FNVDPROGRESS *PFNVDPROGRESS;

  • trunk/include/VBox/vd-plugin.h

    r82968 r85121  
    8585 * @param   pRegisterCallbacks Pointer to the register callbacks structure.
    8686 */
    87 typedef DECLCALLBACK(int) FNVDPLUGINLOAD(void *pvUser, PVDBACKENDREGISTER pRegisterCallbacks);
     87typedef DECLCALLBACKTYPE(int, FNVDPLUGINLOAD,(void *pvUser, PVDBACKENDREGISTER pRegisterCallbacks));
    8888typedef FNVDPLUGINLOAD *PFNVDPLUGINLOAD;
    8989#define VD_PLUGIN_LOAD_NAME "VDPluginLoad"

  • trunk/include/VBox/vd.h

    r82968 r85121  
    462462 * Request completion callback for the async read/write API.
    463463 */
    464 typedef DECLCALLBACK(void) FNVDASYNCTRANSFERCOMPLETE (void *pvUser1, void *pvUser2, int rcReq);
     464typedef DECLCALLBACKTYPE(void, FNVDASYNCTRANSFERCOMPLETE,(void *pvUser1, void *pvUser2, int rcReq));
    465465/** Pointer to a transfer compelte callback. */
    466466typedef FNVDASYNCTRANSFERCOMPLETE *PFNVDASYNCTRANSFERCOMPLETE;
    … …  
    17251725 * @param   rcReq           The completion status code.
    17261726 */
    1727 typedef DECLCALLBACK(void) FNVDIOQUEUEREQCOMPLETE(VDIOQUEUE hVdIoQueue, PVDISK pDisk,
    1728                                                   VDIOREQ hVdIoReq, void *pvVdIoReq,
    1729                                                   int rcReq);
     1727typedef DECLCALLBACKTYPE(void, FNVDIOQUEUEREQCOMPLETE,(VDIOQUEUE hVdIoQueue, PVDISK pDisk,
     1728                                                       VDIOREQ hVdIoReq,  void *pvVdIoReq, int rcReq));
    17301729/** Pointer to a VD I/O queue request completion callback. */
    17311730typedef FNVDIOQUEUEREQCOMPLETE *PFNVDIOQUEUEREQCOMPLETE;

  • trunk/include/VBox/vmm/cfgm.h

    r82968 r85121  
    8282 * @param   pvUser      The argument supplied to VMR3Create().
    8383 */
    84 typedef DECLCALLBACK(int) FNCFGMCONSTRUCTOR(PUVM pUVM, PVM pVM, void *pvUser);
     84typedef DECLCALLBACKTYPE(int, FNCFGMCONSTRUCTOR,(PUVM pUVM, PVM pVM, void *pvUser));
    8585/** Pointer to a FNCFGMCONSTRUCTOR(). */
    8686typedef FNCFGMCONSTRUCTOR *PFNCFGMCONSTRUCTOR;

  • trunk/include/VBox/vmm/dbgf.h

    r84766 r85121  
    906906 * @param   pBp         Pointer to the breakpoint information. (readonly)
    907907 */
    908 typedef DECLCALLBACK(int) FNDBGFBPENUM(PUVM pUVM, void *pvUser, PCDBGFBP pBp);
     908typedef DECLCALLBACKTYPE(int, FNDBGFBPENUM,(PUVM pUVM, void *pvUser, PCDBGFBP pBp));
    909909/** Pointer to a breakpoint enumeration callback function. */
    910910typedef FNDBGFBPENUM *PFNDBGFBPENUM;
    … …  
    954954     * @param   ...         Arguments.
    955955     */
    956     DECLCALLBACKMEMBER(void, pfnPrintf)(PCDBGFINFOHLP pHlp, const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(2, 3);
     956    DECLCALLBACKMEMBER(void, pfnPrintf,(PCDBGFINFOHLP pHlp, const char *pszFormat, ...)) RT_IPRT_FORMAT_ATTR(2, 3);
    957957
    958958    /**
    … …  
    963963     * @param   args        Argument list.
    964964     */
    965     DECLCALLBACKMEMBER(void, pfnPrintfV)(PCDBGFINFOHLP pHlp, const char *pszFormat, va_list args) RT_IPRT_FORMAT_ATTR(2, 0);
     965    DECLCALLBACKMEMBER(void, pfnPrintfV,(PCDBGFINFOHLP pHlp, const char *pszFormat, va_list args)) RT_IPRT_FORMAT_ATTR(2, 0);
    966966
    967967    /**
    … …  
    973973     * @param   pState      The getopt state.
    974974     */
    975     DECLCALLBACKMEMBER(void, pfnGetOptError)(PCDBGFINFOHLP pHlp, int rc, union RTGETOPTUNION *pValueUnion,
    976                                              struct RTGETOPTSTATE *pState);
     975    DECLCALLBACKMEMBER(void, pfnGetOptError,(PCDBGFINFOHLP pHlp, int rc, union RTGETOPTUNION *pValueUnion,
     976                                             struct RTGETOPTSTATE *pState));
    977977} DBGFINFOHLP;
    978978
    … …  
    985985 * @param   pszArgs     Argument string. Optional and specific to the handler.
    986986 */
    987 typedef DECLCALLBACK(void) FNDBGFHANDLERDEV(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs);
     987typedef DECLCALLBACKTYPE(void, FNDBGFHANDLERDEV,(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs));
    988988/** Pointer to a FNDBGFHANDLERDEV function. */
    989989typedef FNDBGFHANDLERDEV  *PFNDBGFHANDLERDEV;
    … …  
    996996 * @param   pszArgs     Argument string. Optional and specific to the handler.
    997997 */
    998 typedef DECLCALLBACK(void) FNDBGFHANDLERDRV(PPDMDRVINS pDrvIns, PCDBGFINFOHLP pHlp, const char *pszArgs);
     998typedef DECLCALLBACKTYPE(void, FNDBGFHANDLERDRV,(PPDMDRVINS pDrvIns, PCDBGFINFOHLP pHlp, const char *pszArgs));
    999999/** Pointer to a FNDBGFHANDLERDRV function. */
    10001000typedef FNDBGFHANDLERDRV  *PFNDBGFHANDLERDRV;
    … …  
    10071007 * @param   pszArgs     Argument string. Optional and specific to the handler.
    10081008 */
    1009 typedef DECLCALLBACK(void) FNDBGFHANDLERINT(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs);
     1009typedef DECLCALLBACKTYPE(void, FNDBGFHANDLERINT,(PVM pVM, PCDBGFINFOHLP pHlp, const char *pszArgs));
    10101010/** Pointer to a FNDBGFHANDLERINT function. */
    10111011typedef FNDBGFHANDLERINT  *PFNDBGFHANDLERINT;
    … …  
    10181018 * @param   pszArgs     Argument string. Optional and specific to the handler.
    10191019 */
    1020 typedef DECLCALLBACK(void) FNDBGFHANDLEREXT(void *pvUser, PCDBGFINFOHLP pHlp, const char *pszArgs);
     1020typedef DECLCALLBACKTYPE(void, FNDBGFHANDLEREXT,(void *pvUser, PCDBGFINFOHLP pHlp, const char *pszArgs));
    10211021/** Pointer to a FNDBGFHANDLEREXT function. */
    10221022typedef FNDBGFHANDLEREXT  *PFNDBGFHANDLEREXT;
    … …  
    10301030 * @param   papszArgs   Argument vector.
    10311031 */
    1032 typedef DECLCALLBACK(void) FNDBGFINFOARGVDEV(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, int cArgs, char **papszArgs);
     1032typedef DECLCALLBACKTYPE(void, FNDBGFINFOARGVDEV,(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, int cArgs, char **papszArgs));
    10331033/** Pointer to a FNDBGFINFOARGVDEV function. */
    10341034typedef FNDBGFINFOARGVDEV *PFNDBGFINFOARGVDEV;
    … …  
    10421042 * @param   papszArgs   Argument vector.
    10431043 */
    1044 typedef DECLCALLBACK(void) FNDBGFINFOARGVUSB(PPDMUSBINS pUsbIns, PCDBGFINFOHLP pHlp, int cArgs, char **papszArgs);
     1044typedef DECLCALLBACKTYPE(void, FNDBGFINFOARGVUSB,(PPDMUSBINS pUsbIns, PCDBGFINFOHLP pHlp, int cArgs, char **papszArgs));
    10451045/** Pointer to a FNDBGFINFOARGVUSB function. */
    10461046typedef FNDBGFINFOARGVUSB *PFNDBGFINFOARGVUSB;
    … …  
    10541054 * @param   papszArgs   Argument vector.
    10551055 */
    1056 typedef DECLCALLBACK(void) FNDBGFINFOARGVDRV(PPDMDRVINS pDrvIns, PCDBGFINFOHLP pHlp, int cArgs, char **papszArgs);
     1056typedef DECLCALLBACKTYPE(void, FNDBGFINFOARGVDRV,(PPDMDRVINS pDrvIns, PCDBGFINFOHLP pHlp, int cArgs, char **papszArgs));
    10571057/** Pointer to a FNDBGFINFOARGVDRV function. */
    10581058typedef FNDBGFINFOARGVDRV *PFNDBGFINFOARGVDRV;
    … …  
    10661066 * @param   papszArgs   Argument vector.
    10671067 */
    1068 typedef DECLCALLBACK(void) FNDBGFINFOARGVINT(PVM pVM, PCDBGFINFOHLP pHlp, int cArgs, char **papszArgs);
     1068typedef DECLCALLBACKTYPE(void, FNDBGFINFOARGVINT,(PVM pVM, PCDBGFINFOHLP pHlp, int cArgs, char **papszArgs));
    10691069/** Pointer to a FNDBGFINFOARGVINT function. */
    10701070typedef FNDBGFINFOARGVINT *PFNDBGFINFOARGVINT;
    … …  
    10781078 * @param   papszArgs   Argument vector.
    10791079 */
    1080 typedef DECLCALLBACK(void) FNDBGFINFOARGVEXT(void *pvUser, PCDBGFINFOHLP pHlp, int cArgs, char **papszArgs);
     1080typedef DECLCALLBACKTYPE(void, FNDBGFINFOARGVEXT,(void *pvUser, PCDBGFINFOHLP pHlp, int cArgs, char **papszArgs));
    10811081/** Pointer to a FNDBGFINFOARGVEXT function. */
    10821082typedef FNDBGFINFOARGVEXT *PFNDBGFINFOARGVEXT;
    … …  
    11681168 * @param   pszDesc     The description.
    11691169 */
    1170 typedef DECLCALLBACK(int) FNDBGFINFOENUM(PUVM pUVM, const char *pszName, const char *pszDesc, void *pvUser);
     1170typedef DECLCALLBACKTYPE(int, FNDBGFINFOENUM,(PUVM pUVM, const char *pszName, const char *pszDesc, void *pvUser));
    11711171/** Pointer to a FNDBGFINFOENUM function. */
    11721172typedef FNDBGFINFOENUM *PFNDBGFINFOENUM;
    … …  
    19561956     * @remarks Does not take the device lock or anything like that.
    19571957     */
    1958     DECLCALLBACKMEMBER(int, pfnGet)(void *pvUser, struct DBGFREGSUBFIELD const *pSubField, PRTUINT128U puValue);
     1958    DECLCALLBACKMEMBER(int, pfnGet,(void *pvUser, struct DBGFREGSUBFIELD const *pSubField, PRTUINT128U puValue));
    19591959    /** Setter (optional).
    19601960     * @remarks Does not take the device lock or anything like that.
    19611961     */
    1962     DECLCALLBACKMEMBER(int, pfnSet)(void *pvUser, struct DBGFREGSUBFIELD const *pSubField, RTUINT128U uValue, RTUINT128U fMask);
     1962    DECLCALLBACKMEMBER(int, pfnSet,(void *pvUser, struct DBGFREGSUBFIELD const *pSubField, RTUINT128U uValue, RTUINT128U fMask));
    19631963} DBGFREGSUBFIELD;
    19641964/** Pointer to a const register sub-field descriptor. */
    … …  
    20172017     * @remarks Does not take the device lock or anything like that.
    20182018     */
    2019     DECLCALLBACKMEMBER(int, pfnGet)(void *pvUser, struct DBGFREGDESC const *pDesc, PDBGFREGVAL pValue);
     2019    DECLCALLBACKMEMBER(int, pfnGet,(void *pvUser, struct DBGFREGDESC const *pDesc, PDBGFREGVAL pValue));
    20202020    /** Setter.
    20212021     * @remarks Does not take the device lock or anything like that.
    20222022     */
    2023     DECLCALLBACKMEMBER(int, pfnSet)(void *pvUser, struct DBGFREGDESC const *pDesc, PCDBGFREGVAL pValue, PCDBGFREGVAL pfMask);
     2023    DECLCALLBACKMEMBER(int, pfnSet,(void *pvUser, struct DBGFREGDESC const *pDesc, PCDBGFREGVAL pValue, PCDBGFREGVAL pfMask));
    20242024    /** Aliases (optional). */
    20252025    PCDBGFREGALIAS          paAliases;
    … …  
    22022202     * @param   pvData  Pointer to the instance data.
    22032203     */
    2204     DECLCALLBACKMEMBER(int, pfnConstruct)(PUVM pUVM, void *pvData);
     2204    DECLCALLBACKMEMBER(int, pfnConstruct,(PUVM pUVM, void *pvData));
    22052205
    22062206    /**
    … …  
    22102210     * @param   pvData  Pointer to the instance data.
    22112211     */
    2212     DECLCALLBACKMEMBER(void, pfnDestruct)(PUVM pUVM, void *pvData);
     2212    DECLCALLBACKMEMBER(void, pfnDestruct,(PUVM pUVM, void *pvData));
    22132213
    22142214    /**
    … …  
    22222222     * @param   pvData  Pointer to the instance data.
    22232223     */
    2224     DECLCALLBACKMEMBER(bool, pfnProbe)(PUVM pUVM, void *pvData);
     2224    DECLCALLBACKMEMBER(bool, pfnProbe,(PUVM pUVM, void *pvData));
    22252225
    22262226    /**
    … …  
    22332233     * @param   pvData  Pointer to the instance data.
    22342234     */
    2235     DECLCALLBACKMEMBER(int, pfnInit)(PUVM pUVM, void *pvData);
     2235    DECLCALLBACKMEMBER(int, pfnInit,(PUVM pUVM, void *pvData));
    22362236
    22372237    /**
    … …  
    22442244     * @param   pvData  Pointer to the instance data.
    22452245     */
    2246     DECLCALLBACKMEMBER(int, pfnRefresh)(PUVM pUVM, void *pvData);
     2246    DECLCALLBACKMEMBER(int, pfnRefresh,(PUVM pUVM, void *pvData));
    22472247
    22482248    /**
    … …  
    22552255     * @param   pvData  Pointer to the instance data.
    22562256     */
    2257     DECLCALLBACKMEMBER(void, pfnTerm)(PUVM pUVM, void *pvData);
     2257    DECLCALLBACKMEMBER(void, pfnTerm,(PUVM pUVM, void *pvData));
    22582258
    22592259    /**
    … …  
    22682268     * @param   cchVersion  The size of the version string buffer.
    22692269     */
    2270     DECLCALLBACKMEMBER(int, pfnQueryVersion)(PUVM pUVM, void *pvData, char *pszVersion, size_t cchVersion);
     2270    DECLCALLBACKMEMBER(int, pfnQueryVersion,(PUVM pUVM, void *pvData, char *pszVersion, size_t cchVersion));
    22712271
    22722272    /**
    … …  
    22832283     * @param   enmIf   The interface identifier.
    22842284     */
    2285     DECLCALLBACKMEMBER(void *, pfnQueryInterface)(PUVM pUVM, void *pvData, DBGFOSINTERFACE enmIf);
     2285    DECLCALLBACKMEMBER(void *, pfnQueryInterface,(PUVM pUVM, void *pvData, DBGFOSINTERFACE enmIf));
    22862286
    22872287    /**
    … …  
    23002300     * @param   puScratch       Scratch area (initialized to zero, no dtor).
    23012301     */
    2302     DECLCALLBACKMEMBER(int, pfnStackUnwindAssist)(PUVM pUVM, void *pvData, VMCPUID idCpu, PDBGFSTACKFRAME pFrame,
     2302    DECLCALLBACKMEMBER(int, pfnStackUnwindAssist,(PUVM pUVM, void *pvData, VMCPUID idCpu, PDBGFSTACKFRAME pFrame,
    23032303                                                  PRTDBGUNWINDSTATE pState, PCCPUMCTX pInitialCtx, RTDBGAS hAs,
    2304                                                   uint64_t *puScratch);
     2304                                                  uint64_t *puScratch));
    23052305
    23062306    /** Trailing magic (DBGFOSREG_MAGIC). */
    … …  
    23472347     *                      holds the necessary buffer size.  Optional.
    23482348     */
    2349     DECLCALLBACKMEMBER(int, pfnQueryKernelLog)(struct DBGFOSIDMESG *pThis, PUVM pUVM, uint32_t fFlags, uint32_t cMessages,
    2350                                                char *pszBuf, size_t cbBuf, size_t *pcbActual);
     2349    DECLCALLBACKMEMBER(int, pfnQueryKernelLog,(struct DBGFOSIDMESG *pThis, PUVM pUVM, uint32_t fFlags, uint32_t cMessages,
     2350                                               char *pszBuf, size_t cbBuf, size_t *pcbActual));
    23512351    /** Trailing magic (DBGFOSIDMESG_MAGIC). */
    23522352    uint32_t    u32EndMagic;
    … …  
    24072407 * @param   uArg            Extra argument.
    24082408 */
    2409 typedef DECLCALLBACK(int) FNDBGFPLUGIN(DBGFPLUGINOP enmOperation, PUVM pUVM, uintptr_t uArg);
     2409typedef DECLCALLBACKTYPE(int, FNDBGFPLUGIN,(DBGFPLUGINOP enmOperation, PUVM pUVM, uintptr_t uArg));
    24102410/** Pointer to a FNDBGFPLUGIN. */
    24112411typedef FNDBGFPLUGIN *PFNDBGFPLUGIN;
    … …  
    26242624 * @param   pvUser          Opaque user data.
    26252625 */
    2626 typedef DECLCALLBACK(int) FNDBGFR3TYPEVALDUMP(uint32_t off, const char *pszField, uint32_t iLvl,
    2627                                               DBGFTYPEBUILTIN enmType, size_t cbType,
    2628                                               PDBGFTYPEVALBUF pValBuf, uint32_t cValBufs,
    2629                                               void *pvUser);
     2626typedef DECLCALLBACKTYPE(int, FNDBGFR3TYPEVALDUMP,(uint32_t off, const char *pszField, uint32_t iLvl,
     2627                                                   DBGFTYPEBUILTIN enmType, size_t cbType,
     2628                                                   PDBGFTYPEVALBUF pValBuf, uint32_t cValBufs, void *pvUser));
    26302629/** Pointer to a FNDBGFR3TYPEVALDUMP. */
    26312630typedef FNDBGFR3TYPEVALDUMP *PFNDBGFR3TYPEVALDUMP;
    … …  
    26442643 * @param   pvUser          Opaque user data.
    26452644 */
    2646 typedef DECLCALLBACK(int) FNDBGFR3TYPEDUMP(uint32_t off, const char *pszField, uint32_t iLvl,
    2647                                            const char *pszType, uint32_t fTypeFlags,
    2648                                            uint32_t cElements, void *pvUser);
     2645typedef DECLCALLBACKTYPE(int, FNDBGFR3TYPEDUMP,(uint32_t off, const char *pszField, uint32_t iLvl,
     2646                                                const char *pszType, uint32_t fTypeFlags,
     2647                                                uint32_t cElements, void *pvUser));
    26492648/** Pointer to a FNDBGFR3TYPEDUMP. */
    26502649typedef FNDBGFR3TYPEDUMP *PFNDBGFR3TYPEDUMP;

  • trunk/include/VBox/vmm/em.h

    r82968 r85121  
    116116 * @{
    117117 */
    118 typedef DECLCALLBACK(uint32_t)  FNEMULATEPARAM2UINT32(void *pvParam1, uint64_t val2);
    119 typedef FNEMULATEPARAM2UINT32  *PFNEMULATEPARAM2UINT32;
    120 typedef DECLCALLBACK(uint32_t)  FNEMULATEPARAM2(void *pvParam1, size_t val2);
    121 typedef FNEMULATEPARAM2        *PFNEMULATEPARAM2;
    122 typedef DECLCALLBACK(uint32_t)  FNEMULATEPARAM3(void *pvParam1, uint64_t val2, size_t val3);
    123 typedef FNEMULATEPARAM3        *PFNEMULATEPARAM3;
    124 typedef DECLCALLBACK(int)       FNEMULATELOCKPARAM2(void *pvParam1, uint64_t val2, RTGCUINTREG32 *pf);
    125 typedef FNEMULATELOCKPARAM2    *PFNEMULATELOCKPARAM2;
    126 typedef DECLCALLBACK(int)       FNEMULATELOCKPARAM3(void *pvParam1, uint64_t val2, size_t cb, RTGCUINTREG32 *pf);
    127 typedef FNEMULATELOCKPARAM3    *PFNEMULATELOCKPARAM3;
     118typedef DECLCALLBACKTYPE(uint32_t, FNEMULATEPARAM2UINT32,(void *pvParam1, uint64_t val2));
     119typedef FNEMULATEPARAM2UINT32    *PFNEMULATEPARAM2UINT32;
     120typedef DECLCALLBACKTYPE(uint32_t, FNEMULATEPARAM2,(void *pvParam1, size_t val2));
     121typedef FNEMULATEPARAM2          *PFNEMULATEPARAM2;
     122typedef DECLCALLBACKTYPE(uint32_t, FNEMULATEPARAM3,(void *pvParam1, uint64_t val2, size_t val3));
     123typedef FNEMULATEPARAM3          *PFNEMULATEPARAM3;
     124typedef DECLCALLBACKTYPE(int, FNEMULATELOCKPARAM2,(void *pvParam1, uint64_t val2, RTGCUINTREG32 *pf));
     125typedef FNEMULATELOCKPARAM2 *PFNEMULATELOCKPARAM2;
     126typedef DECLCALLBACKTYPE(int, FNEMULATELOCKPARAM3,(void *pvParam1, uint64_t val2, size_t cb, RTGCUINTREG32 *pf));
     127typedef FNEMULATELOCKPARAM3 *PFNEMULATELOCKPARAM3;
    128128/** @}  */
    129129

  • trunk/include/VBox/vmm/gim.h

    r82968 r85121  
    109109 * @param   pVM             The cross context VM structure.
    110110 */
    111 typedef DECLCALLBACK(void) FNGIMDEBUGBUFAVAIL(PVM pVM);
     111typedef DECLCALLBACKTYPE(void, FNGIMDEBUGBUFAVAIL,(PVM pVM));
    112112/** Pointer to GIM debug buffer available callback. */
    113113typedef FNGIMDEBUGBUFAVAIL *PFNGIMDEBUGBUFAVAIL;

  • trunk/include/VBox/vmm/gvmm.h

    r82989 r85121  
    166166 * @param   pvUser      The user parameter.
    167167 *  */
    168 typedef DECLCALLBACK(int) FNGVMMR0ENUMCALLBACK(PGVM pGVM, void *pvUser);
     168typedef DECLCALLBACKTYPE(int, FNGVMMR0ENUMCALLBACK,(PGVM pGVM, void *pvUser));
    169169/** Pointer to an VM enumeration callback function. */
    170170typedef FNGVMMR0ENUMCALLBACK *PFNGVMMR0ENUMCALLBACK;

  • trunk/include/VBox/vmm/iom.h

    r82968 r85121  
    189189 * @remarks Caller enters the device critical section.
    190190 */
    191 typedef DECLCALLBACK(int) FNIOMIOPORTIN(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t *pu32, unsigned cb);
     191typedef DECLCALLBACKTYPE(int, FNIOMIOPORTIN,(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t *pu32, unsigned cb));
    192192/** Pointer to a FNIOMIOPORTIN(). */
    193193typedef FNIOMIOPORTIN *PFNIOMIOPORTIN;
    … …  
    208208 * @remarks Caller enters the device critical section.
    209209 */
    210 typedef DECLCALLBACK(int) FNIOMIOPORTINSTRING(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint8_t *pbDst,
    211                                               uint32_t *pcTransfers, unsigned cb);
     210typedef DECLCALLBACKTYPE(int, FNIOMIOPORTINSTRING,(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint8_t *pbDst,
     211                                                   uint32_t *pcTransfers, unsigned cb));
    212212/** Pointer to a FNIOMIOPORTINSTRING(). */
    213213typedef FNIOMIOPORTINSTRING *PFNIOMIOPORTINSTRING;
    … …  
    225225 * @remarks Caller enters the device critical section.
    226226 */
    227 typedef DECLCALLBACK(int) FNIOMIOPORTOUT(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t u32, unsigned cb);
     227typedef DECLCALLBACKTYPE(int, FNIOMIOPORTOUT,(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, uint32_t u32, unsigned cb));
    228228/** Pointer to a FNIOMIOPORTOUT(). */
    229229typedef FNIOMIOPORTOUT *PFNIOMIOPORTOUT;
    … …  
    243243 * @remarks Caller enters the device critical section.
    244244 */
    245 typedef DECLCALLBACK(int) FNIOMIOPORTOUTSTRING(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, const uint8_t *pbSrc,
    246                                                uint32_t *pcTransfers, unsigned cb);
     245typedef DECLCALLBACKTYPE(int, FNIOMIOPORTOUTSTRING,(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT uPort, const uint8_t *pbSrc,
     246                                                    uint32_t *pcTransfers, unsigned cb));
    247247/** Pointer to a FNIOMIOPORTOUTSTRING(). */
    248248typedef FNIOMIOPORTOUTSTRING *PFNIOMIOPORTOUTSTRING;
    … …  
    264264 * @remarks Caller enters the device critical section.
    265265 */
    266 typedef DECLCALLBACK(VBOXSTRICTRC) FNIOMIOPORTNEWIN(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, uint32_t *pu32, unsigned cb);
     266typedef DECLCALLBACKTYPE(VBOXSTRICTRC, FNIOMIOPORTNEWIN,(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort,
     267                                                         uint32_t *pu32, unsigned cb));
    267268/** Pointer to a FNIOMIOPORTNEWIN(). */
    268269typedef FNIOMIOPORTNEWIN *PFNIOMIOPORTNEWIN;
    … …  
    284285 * @remarks Caller enters the device critical section.
    285286 */
    286 typedef DECLCALLBACK(VBOXSTRICTRC) FNIOMIOPORTNEWINSTRING(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, uint8_t *pbDst,
    287                                                           uint32_t *pcTransfers, unsigned cb);
     287typedef DECLCALLBACKTYPE(VBOXSTRICTRC, FNIOMIOPORTNEWINSTRING,(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, uint8_t *pbDst,
     288                                                               uint32_t *pcTransfers, unsigned cb));
    288289/** Pointer to a FNIOMIOPORTNEWINSTRING(). */
    289290typedef FNIOMIOPORTNEWINSTRING *PFNIOMIOPORTNEWINSTRING;
    … …  
    302303 * @remarks Caller enters the device critical section.
    303304 */
    304 typedef DECLCALLBACK(VBOXSTRICTRC) FNIOMIOPORTNEWOUT(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, uint32_t u32, unsigned cb);
     305typedef DECLCALLBACKTYPE(VBOXSTRICTRC, FNIOMIOPORTNEWOUT,(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort,
     306                                                          uint32_t u32, unsigned cb));
    305307/** Pointer to a FNIOMIOPORTNEWOUT(). */
    306308typedef FNIOMIOPORTNEWOUT *PFNIOMIOPORTNEWOUT;
    … …  
    321323 * @remarks Caller enters the device critical section.
    322324 */
    323 typedef DECLCALLBACK(VBOXSTRICTRC) FNIOMIOPORTNEWOUTSTRING(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort, const uint8_t *pbSrc,
    324                                                            uint32_t *pcTransfers, unsigned cb);
     325typedef DECLCALLBACKTYPE(VBOXSTRICTRC, FNIOMIOPORTNEWOUTSTRING,(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT offPort,
     326                                                                const uint8_t *pbSrc, uint32_t *pcTransfers, unsigned cb));
    325327/** Pointer to a FNIOMIOPORTNEWOUTSTRING(). */
    326328typedef FNIOMIOPORTNEWOUTSTRING *PFNIOMIOPORTNEWOUTSTRING;
    … …  
    358360 * @remarks Caller enters the device critical section.
    359361 */
    360 typedef DECLCALLBACK(int) FNIOMMMIOREAD(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb);
     362typedef DECLCALLBACKTYPE(int, FNIOMMMIOREAD,(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb));
    361363/** Pointer to a FNIOMMMIOREAD(). */
    362364typedef FNIOMMMIOREAD *PFNIOMMMIOREAD;
    … …  
    374376 * @remarks Caller enters the device critical section.
    375377 */
    376 typedef DECLCALLBACK(int) FNIOMMMIOWRITE(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void const *pv, unsigned cb);
     378typedef DECLCALLBACKTYPE(int, FNIOMMMIOWRITE,(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void const *pv, unsigned cb));
    377379/** Pointer to a FNIOMMMIOWRITE(). */
    378380typedef FNIOMMMIOWRITE *PFNIOMMMIOWRITE;
    … …  
    391393 * @remarks Caller enters the device critical section.
    392394 */
    393 typedef DECLCALLBACK(int) FNIOMMMIOFILL(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, uint32_t u32Item, unsigned cbItem, unsigned cItems);
     395typedef DECLCALLBACKTYPE(int, FNIOMMMIOFILL,(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr,
     396                                             uint32_t u32Item, unsigned cbItem, unsigned cItems));
    394397/** Pointer to a FNIOMMMIOFILL(). */
    395398typedef FNIOMMMIOFILL *PFNIOMMMIOFILL;
    … …  
    409412 * @remarks Caller enters the device critical section.
    410413 */
    411 typedef DECLCALLBACK(VBOXSTRICTRC) FNIOMMMIONEWREAD(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off, void *pv, uint32_t cb);
     414typedef DECLCALLBACKTYPE(VBOXSTRICTRC, FNIOMMMIONEWREAD,(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off, void *pv, uint32_t cb));
    412415/** Pointer to a FNIOMMMIONEWREAD(). */
    413416typedef FNIOMMMIONEWREAD *PFNIOMMMIONEWREAD;
    … …  
    426429 * @remarks Caller enters the device critical section.
    427430 */
    428 typedef DECLCALLBACK(VBOXSTRICTRC) FNIOMMMIONEWWRITE(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off, void const *pv, uint32_t cb);
     431typedef DECLCALLBACKTYPE(VBOXSTRICTRC, FNIOMMMIONEWWRITE,(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off,
     432                                                          void const *pv, uint32_t cb));
    429433/** Pointer to a FNIOMMMIONEWWRITE(). */
    430434typedef FNIOMMMIONEWWRITE *PFNIOMMMIONEWWRITE;
    … …  
    444448 * @remarks Caller enters the device critical section.
    445449 */
    446 typedef DECLCALLBACK(VBOXSTRICTRC) FNIOMMMIONEWFILL(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off,
    447                                                     uint32_t u32Item, uint32_t cbItem, uint32_t cItems);
     450typedef DECLCALLBACKTYPE(VBOXSTRICTRC, FNIOMMMIONEWFILL,(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS off,
     451                                                         uint32_t u32Item, uint32_t cbItem, uint32_t cItems));
    448452/** Pointer to a FNIOMMMIONEWFILL(). */
    449453typedef FNIOMMMIONEWFILL *PFNIOMMMIONEWFILL;

  • trunk/include/VBox/vmm/pdmapi.h

    r84826 r85121  
    6868 *                              unmapped.
    6969 */
    70 typedef DECLCALLBACK(void) FNPDMVMMDEVHEAPNOTIFY(PVM pVM, void *pvAllocation, RTGCPHYS GCPhysAllocation);
     70typedef DECLCALLBACKTYPE(void, FNPDMVMMDEVHEAPNOTIFY,(PVM pVM, void *pvAllocation, RTGCPHYS GCPhysAllocation));
    7171/** Pointer (ring-3) to a FNPDMVMMDEVHEAPNOTIFY function. */
    7272typedef R3PTRTYPE(FNPDMVMMDEVHEAPNOTIFY *) PFNPDMVMMDEVHEAPNOTIFY;
    … …  
    126126 * @param   pvArg           User argument.
    127127 */
    128 typedef DECLCALLBACK(int) FNPDMR3ENUM(PVM pVM, const char *pszFilename, const char *pszName,
    129                                       RTUINTPTR ImageBase, size_t cbImage, PDMLDRCTX enmCtx, void *pvArg);
     128typedef DECLCALLBACKTYPE(int, FNPDMR3ENUM,(PVM pVM, const char *pszFilename, const char *pszName,
     129                                           RTUINTPTR ImageBase, size_t cbImage, PDMLDRCTX enmCtx, void *pvArg));
    130130/** Pointer to a FNPDMR3ENUM() function. */
    131131typedef FNPDMR3ENUM *PFNPDMR3ENUM;

  • trunk/include/VBox/vmm/pdmasynccompletion.h

    r82968 r85121  
    6464 * @param   rc          The status code of the completed request.
    6565 */
    66 typedef DECLCALLBACK(void) FNPDMASYNCCOMPLETEDEV(PPDMDEVINS pDevIns, void *pvUser, int rc);
     66typedef DECLCALLBACKTYPE(void, FNPDMASYNCCOMPLETEDEV,(PPDMDEVINS pDevIns, void *pvUser, int rc));
    6767/** Pointer to a FNPDMASYNCCOMPLETEDEV(). */
    6868typedef FNPDMASYNCCOMPLETEDEV *PFNPDMASYNCCOMPLETEDEV;
    … …  
    7777 * @param   rc          The status code of the completed request.
    7878 */
    79 typedef DECLCALLBACK(void) FNPDMASYNCCOMPLETEDRV(PPDMDRVINS pDrvIns, void *pvTemplateUser, void *pvUser, int rc);
     79typedef DECLCALLBACKTYPE(void, FNPDMASYNCCOMPLETEDRV,(PPDMDRVINS pDrvIns, void *pvTemplateUser, void *pvUser, int rc));
    8080/** Pointer to a FNPDMASYNCCOMPLETEDRV(). */
    8181typedef FNPDMASYNCCOMPLETEDRV *PFNPDMASYNCCOMPLETEDRV;
    … …  
    8989 * @param   rc          The status code of the completed request.
    9090 */
    91 typedef DECLCALLBACK(void) FNPDMASYNCCOMPLETEUSB(PPDMUSBINS pUsbIns, void *pvUser, int rc);
     91typedef DECLCALLBACKTYPE(void, FNPDMASYNCCOMPLETEUSB,(PPDMUSBINS pUsbIns, void *pvUser, int rc));
    9292/** Pointer to a FNPDMASYNCCOMPLETEUSB(). */
    9393typedef FNPDMASYNCCOMPLETEUSB *PFNPDMASYNCCOMPLETEUSB;
    … …  
    102102 * @param   rc          The status code of the completed request.
    103103 */
    104 typedef DECLCALLBACK(void) FNPDMASYNCCOMPLETEINT(PVM pVM, void *pvUser, void *pvUser2, int rc);
     104typedef DECLCALLBACKTYPE(void, FNPDMASYNCCOMPLETEINT,(PVM pVM, void *pvUser, void *pvUser2, int rc));
    105105/** Pointer to a FNPDMASYNCCOMPLETEINT(). */
    106106typedef FNPDMASYNCCOMPLETEINT *PFNPDMASYNCCOMPLETEINT;

  • trunk/include/VBox/vmm/pdmaudioifs.h

    r82968 r85121  
    931931 * @todo r=bird: The @a paDst size is presumable given in @a pOpts->cFrames?
    932932 */
    933 typedef DECLCALLBACK(uint32_t) FNPDMAUDIOMIXBUFCONVFROM(PPDMAUDIOFRAME paDst, const void *pvSrc, uint32_t cbSrc,
    934                                                         PCPDMAUDMIXBUFCONVOPTS pOpts);
     933typedef DECLCALLBACKTYPE(uint32_t, FNPDMAUDIOMIXBUFCONVFROM,(PPDMAUDIOFRAME paDst, const void *pvSrc, uint32_t cbSrc,
     934                                                             PCPDMAUDMIXBUFCONVOPTS pOpts));
    935935/** Pointer to a convertion-from function used by the PDM audio buffer mixer. */
    936936typedef FNPDMAUDIOMIXBUFCONVFROM *PFNPDMAUDIOMIXBUFCONVFROM;
    … …  
    945945 *       this implicitly gives the pvDst size too, right?
    946946 */
    947 typedef DECLCALLBACK(void) FNPDMAUDIOMIXBUFCONVTO(void *pvDst, PCPDMAUDIOFRAME paSrc, PCPDMAUDMIXBUFCONVOPTS pOpts);
     947typedef DECLCALLBACKTYPE(void, FNPDMAUDIOMIXBUFCONVTO,(void *pvDst, PCPDMAUDIOFRAME paSrc, PCPDMAUDMIXBUFCONVOPTS pOpts));
    948948/** Pointer to a convertion-to function used by the PDM audio buffer mixer. */
    949949typedef FNPDMAUDIOMIXBUFCONVTO *PFNPDMAUDIOMIXBUFCONVTO;
    … …  
    13381338 * @param   cbUser              Size (in bytes) of user argument.
    13391339 */
    1340 typedef DECLCALLBACK(int) FNPDMHOSTAUDIOCALLBACK(PPDMDRVINS pDrvIns, PDMAUDIOBACKENDCBTYPE enmType, void *pvUser, size_t cbUser);
     1340typedef DECLCALLBACKTYPE(int, FNPDMHOSTAUDIOCALLBACK,(PPDMDRVINS pDrvIns, PDMAUDIOBACKENDCBTYPE enmType,
     1341                                                      void *pvUser, size_t cbUser));
    13411342/** Pointer to a FNPDMHOSTAUDIOCALLBACK(). */
    13421343typedef FNPDMHOSTAUDIOCALLBACK *PFNPDMHOSTAUDIOCALLBACK;

  • trunk/include/VBox/vmm/pdmblkcache.h

    r82968 r85121  
    7171 * @param   rc              The status code of the completed request.
    7272 */
    73 typedef DECLCALLBACK(void) FNPDMBLKCACHEXFERCOMPLETEDRV(PPDMDRVINS pDrvIns, void *pvUser, int rc);
     73typedef DECLCALLBACKTYPE(void, FNPDMBLKCACHEXFERCOMPLETEDRV,(PPDMDRVINS pDrvIns, void *pvUser, int rc));
    7474/** Pointer to a FNPDMBLKCACHEXFERCOMPLETEDRV(). */
    7575typedef FNPDMBLKCACHEXFERCOMPLETEDRV *PFNPDMBLKCACHEXFERCOMPLETEDRV;
    … …  
    8585 * @param   hIoXfer         I/O transfer handle to ping on completion.
    8686 */
    87 typedef DECLCALLBACK(int) FNPDMBLKCACHEXFERENQUEUEDRV(PPDMDRVINS pDrvIns, PDMBLKCACHEXFERDIR enmXferDir,
    88                                                       uint64_t off, size_t cbXfer, PCRTSGBUF pSgBuf, PPDMBLKCACHEIOXFER hIoXfer);
     87typedef DECLCALLBACKTYPE(int, FNPDMBLKCACHEXFERENQUEUEDRV,(PPDMDRVINS pDrvIns, PDMBLKCACHEXFERDIR enmXferDir, uint64_t off,
     88                                                           size_t cbXfer, PCRTSGBUF pSgBuf, PPDMBLKCACHEIOXFER hIoXfer));
    8989/** Pointer to a FNPDMBLKCACHEXFERENQUEUEDRV(). */
    9090typedef FNPDMBLKCACHEXFERENQUEUEDRV *PFNPDMBLKCACHEXFERENQUEUEDRV;
    … …  
    9898 * @param   hIoXfer         I/O handle to return on completion.
    9999 */
    100 typedef DECLCALLBACK(int) FNPDMBLKCACHEXFERENQUEUEDISCARDDRV(PPDMDRVINS pDrvIns, PCRTRANGE paRanges, unsigned cRanges,
    101                                                              PPDMBLKCACHEIOXFER hIoXfer);
     100typedef DECLCALLBACKTYPE(int, FNPDMBLKCACHEXFERENQUEUEDISCARDDRV,(PPDMDRVINS pDrvIns, PCRTRANGE paRanges, unsigned cRanges,
     101                                                                  PPDMBLKCACHEIOXFER hIoXfer));
    102102/** Pointer to a FNPDMBLKCACHEXFERENQUEUEDISCARDDRV(). */
    103103typedef FNPDMBLKCACHEXFERENQUEUEDISCARDDRV *PFNPDMBLKCACHEXFERENQUEUEDISCARDDRV;
    … …  
    110110 * @param   rc              The status code of the completed request.
    111111 */
    112 typedef DECLCALLBACK(void) FNPDMBLKCACHEXFERCOMPLETEDEV(PPDMDEVINS pDevIns, void *pvUser, int rc);
     112typedef DECLCALLBACKTYPE(void, FNPDMBLKCACHEXFERCOMPLETEDEV,(PPDMDEVINS pDevIns, void *pvUser, int rc));
    113113/** Pointer to a FNPDMBLKCACHEXFERCOMPLETEDEV(). */
    114114typedef FNPDMBLKCACHEXFERCOMPLETEDEV *PFNPDMBLKCACHEXFERCOMPLETEDEV;
    … …  
    124124 * @param   hIoXfer         I/O transfer handle to ping on completion.
    125125 */
    126 typedef DECLCALLBACK(int) FNPDMBLKCACHEXFERENQUEUEDEV(PPDMDEVINS pDevIns, PDMBLKCACHEXFERDIR enmXferDir,
    127                                                       uint64_t off, size_t cbXfer, PCRTSGBUF pSgBuf, PPDMBLKCACHEIOXFER hIoXfer);
     126typedef DECLCALLBACKTYPE(int, FNPDMBLKCACHEXFERENQUEUEDEV,(PPDMDEVINS pDevIns, PDMBLKCACHEXFERDIR enmXferDir, uint64_t off,
     127                                                           size_t cbXfer, PCRTSGBUF pSgBuf, PPDMBLKCACHEIOXFER hIoXfer));
    128128/** Pointer to a FNPDMBLKCACHEXFERENQUEUEDEV(). */
    129129typedef FNPDMBLKCACHEXFERENQUEUEDEV *PFNPDMBLKCACHEXFERENQUEUEDEV;
    … …  
    137137 * @param   hIoXfer         I/O handle to return on completion.
    138138 */
    139 typedef DECLCALLBACK(int) FNPDMBLKCACHEXFERENQUEUEDISCARDDEV(PPDMDEVINS pDevIns, PCRTRANGE paRanges, unsigned cRanges,
    140                                                              PPDMBLKCACHEIOXFER hIoXfer);
     139typedef DECLCALLBACKTYPE(int, FNPDMBLKCACHEXFERENQUEUEDISCARDDEV,(PPDMDEVINS pDevIns, PCRTRANGE paRanges, unsigned cRanges,
     140                                                                  PPDMBLKCACHEIOXFER hIoXfer));
    141141/** Pointer to a FNPDMBLKCACHEXFERENQUEUEDISCARDDEV(). */
    142142typedef FNPDMBLKCACHEXFERENQUEUEDISCARDDEV *PFNPDMBLKCACHEXFERENQUEUEDISCARDDEV;
    … …  
    149149 * @param   rc              The status code of the completed request.
    150150 */
    151 typedef DECLCALLBACK(void) FNPDMBLKCACHEXFERCOMPLETEINT(void *pvUserInt, void *pvUser, int rc);
     151typedef DECLCALLBACKTYPE(void, FNPDMBLKCACHEXFERCOMPLETEINT,(void *pvUserInt, void *pvUser, int rc));
    152152/** Pointer to a FNPDMBLKCACHEXFERCOMPLETEINT(). */
    153153typedef FNPDMBLKCACHEXFERCOMPLETEINT *PFNPDMBLKCACHEXFERCOMPLETEINT;
    … …  
    163163 * @param   hIoXfer         I/O transfer handle to ping on completion.
    164164 */
    165 typedef DECLCALLBACK(int) FNPDMBLKCACHEXFERENQUEUEINT(void *pvUser, PDMBLKCACHEXFERDIR enmXferDir,
    166                                                       uint64_t off, size_t cbXfer, PCRTSGBUF pSgBuf, PPDMBLKCACHEIOXFER hIoXfer);
     165typedef DECLCALLBACKTYPE(int, FNPDMBLKCACHEXFERENQUEUEINT,(void *pvUser, PDMBLKCACHEXFERDIR enmXferDir, uint64_t off,
     166                                                           size_t cbXfer, PCRTSGBUF pSgBuf, PPDMBLKCACHEIOXFER hIoXfer));
    167167/** Pointer to a FNPDMBLKCACHEXFERENQUEUEINT(). */
    168168typedef FNPDMBLKCACHEXFERENQUEUEINT *PFNPDMBLKCACHEXFERENQUEUEINT;
    … …  
    176176 * @param   hIoXfer         I/O handle to return on completion.
    177177 */
    178 typedef DECLCALLBACK(int) FNPDMBLKCACHEXFERENQUEUEDISCARDINT(void *pvUser, PCRTRANGE paRanges, unsigned cRanges,
    179                                                              PPDMBLKCACHEIOXFER hIoXfer);
     178typedef DECLCALLBACKTYPE(int, FNPDMBLKCACHEXFERENQUEUEDISCARDINT,(void *pvUser, PCRTRANGE paRanges, unsigned cRanges,
     179                                                                  PPDMBLKCACHEIOXFER hIoXfer));
    180180/** Pointer to a FNPDMBLKCACHEXFERENQUEUEDISCARDINT(). */
    181181typedef FNPDMBLKCACHEXFERENQUEUEDISCARDINT *PFNPDMBLKCACHEXFERENQUEUEDISCARDINT;
    … …  
    188188 * @param   rc              The status code of the completed request.
    189189 */
    190 typedef DECLCALLBACK(void) FNPDMBLKCACHEXFERCOMPLETEUSB(PPDMUSBINS pUsbIns, void *pvUser, int rc);
     190typedef DECLCALLBACKTYPE(void, FNPDMBLKCACHEXFERCOMPLETEUSB,(PPDMUSBINS pUsbIns, void *pvUser, int rc));
    191191/** Pointer to a FNPDMBLKCACHEXFERCOMPLETEUSB(). */
    192192typedef FNPDMBLKCACHEXFERCOMPLETEUSB *PFNPDMBLKCACHEXFERCOMPLETEUSB;
    … …  
    202202 * @param   hIoXfer         I/O transfer handle to ping on completion.
    203203 */
    204 typedef DECLCALLBACK(int) FNPDMBLKCACHEXFERENQUEUEUSB(PPDMUSBINS pUsbIns, PDMBLKCACHEXFERDIR enmXferDir,
    205                                                       uint64_t off, size_t cbXfer, PCRTSGBUF pSgBuf, PPDMBLKCACHEIOXFER hIoXfer);
     204typedef DECLCALLBACKTYPE(int, FNPDMBLKCACHEXFERENQUEUEUSB,(PPDMUSBINS pUsbIns, PDMBLKCACHEXFERDIR enmXferDir, uint64_t off,
     205                                                           size_t cbXfer, PCRTSGBUF pSgBuf, PPDMBLKCACHEIOXFER hIoXfer));
    206206/** Pointer to a FNPDMBLKCACHEXFERENQUEUEUSB(). */
    207207typedef FNPDMBLKCACHEXFERENQUEUEUSB *PFNPDMBLKCACHEXFERENQUEUEUSB;
    … …  
    215215 * @param   hIoXfer         I/O handle to return on completion.
    216216 */
    217 typedef DECLCALLBACK(int) FNPDMBLKCACHEXFERENQUEUEDISCARDUSB(PPDMUSBINS pUsbIns, PCRTRANGE paRanges, unsigned cRanges,
    218                                                              PPDMBLKCACHEIOXFER hIoXfer);
     217typedef DECLCALLBACKTYPE(int, FNPDMBLKCACHEXFERENQUEUEDISCARDUSB,(PPDMUSBINS pUsbIns, PCRTRANGE paRanges, unsigned cRanges,
     218                                                                  PPDMBLKCACHEIOXFER hIoXfer));
    219219/** Pointer to a FNPDMBLKCACHEXFERENQUEUEDISCARDUSB(). */
    220220typedef FNPDMBLKCACHEXFERENQUEUEDISCARDUSB *PFNPDMBLKCACHEXFERENQUEUEDISCARDUSB;

  • trunk/include/VBox/vmm/pdmcommon.h

    r82968 r85121  
    115115 * @thread  EMT(0)
    116116 */
    117 typedef DECLCALLBACK(bool) FNPDMUSBASYNCNOTIFY(PPDMUSBINS pUsbIns);
     117typedef DECLCALLBACKTYPE(bool, FNPDMUSBASYNCNOTIFY,(PPDMUSBINS pUsbIns));
    118118/** Pointer to a FNPDMUSBASYNCNOTIFY. */
    119119typedef FNPDMUSBASYNCNOTIFY *PFNPDMUSBASYNCNOTIFY;
    … …  
    131131 * @thread  EMT(0)
    132132 */
    133 typedef DECLCALLBACK(bool) FNPDMDEVASYNCNOTIFY(PPDMDEVINS pDevIns);
     133typedef DECLCALLBACKTYPE(bool, FNPDMDEVASYNCNOTIFY,(PPDMDEVINS pDevIns));
    134134/** Pointer to a FNPDMDEVASYNCNOTIFY. */
    135135typedef FNPDMDEVASYNCNOTIFY *PFNPDMDEVASYNCNOTIFY;
    … …  
    147147 * @thread  EMT(0)
    148148 */
    149 typedef DECLCALLBACK(bool) FNPDMDRVASYNCNOTIFY(PPDMDRVINS pDrvIns);
     149typedef DECLCALLBACKTYPE(bool, FNPDMDRVASYNCNOTIFY,(PPDMDRVINS pDrvIns));
    150150/** Pointer to a FNPDMDRVASYNCNOTIFY. */
    151151typedef FNPDMDRVASYNCNOTIFY *PFNPDMDRVASYNCNOTIFY;
    … …  
    160160 * @param   u64Arg      Optional integer argument for the operation.
    161161 */
    162 typedef DECLCALLBACK(int) FNPDMDEVREQHANDLERR0(PPDMDEVINS pDevIns, uint32_t uOperation, uint64_t u64Arg);
     162typedef DECLCALLBACKTYPE(int, FNPDMDEVREQHANDLERR0,(PPDMDEVINS pDevIns, uint32_t uOperation, uint64_t u64Arg));
    163163/** Ring-0 pointer to a FNPDMDEVREQHANDLERR0. */
    164164typedef R0PTRTYPE(FNPDMDEVREQHANDLERR0 *) PFNPDMDEVREQHANDLERR0;
    … …  
    172172 * @param   u64Arg      Optional integer argument for the operation.
    173173 */
    174 typedef DECLCALLBACK(int) FNPDMDRVREQHANDLERR0(PPDMDRVINS pDrvIns, uint32_t uOperation, uint64_t u64Arg);
     174typedef DECLCALLBACKTYPE(int, FNPDMDRVREQHANDLERR0,(PPDMDRVINS pDrvIns, uint32_t uOperation, uint64_t u64Arg));
    175175/** Ring-0 pointer to a FNPDMDRVREQHANDLERR0. */
    176176typedef R0PTRTYPE(FNPDMDRVREQHANDLERR0 *) PFNPDMDRVREQHANDLERR0;

  • trunk/include/VBox/vmm/pdmdev.h

    r85007 r85121  
    7575 *                      times, it can be found in pDevIns->pCfg.
    7676 */
    77 typedef DECLCALLBACK(int)   FNPDMDEVCONSTRUCT(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg);
     77typedef DECLCALLBACKTYPE(int, FNPDMDEVCONSTRUCT,(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg));
    7878/** Pointer to a FNPDMDEVCONSTRUCT() function. */
    7979typedef FNPDMDEVCONSTRUCT *PFNPDMDEVCONSTRUCT;
    … …  
    9191 *          the critical section, so the caller cannot exit it.
    9292 */
    93 typedef DECLCALLBACK(int)   FNPDMDEVDESTRUCT(PPDMDEVINS pDevIns);
     93typedef DECLCALLBACKTYPE(int, FNPDMDEVDESTRUCT,(PPDMDEVINS pDevIns));
    9494/** Pointer to a FNPDMDEVDESTRUCT() function. */
    9595typedef FNPDMDEVDESTRUCT *PFNPDMDEVDESTRUCT;
    … …  
    114114 *          not normally require any locking.
    115115 */
    116 typedef DECLCALLBACK(void) FNPDMDEVRELOCATE(PPDMDEVINS pDevIns, RTGCINTPTR offDelta);
     116typedef DECLCALLBACKTYPE(void, FNPDMDEVRELOCATE,(PPDMDEVINS pDevIns, RTGCINTPTR offDelta));
    117117/** Pointer to a FNPDMDEVRELOCATE() function. */
    118118typedef FNPDMDEVRELOCATE *PFNPDMDEVRELOCATE;
    … …  
    126126 * @remarks Caller enters the device critical section.
    127127 */
    128 typedef DECLCALLBACK(void)   FNPDMDEVPOWERON(PPDMDEVINS pDevIns);
     128typedef DECLCALLBACKTYPE(void, FNPDMDEVPOWERON,(PPDMDEVINS pDevIns));
    129129/** Pointer to a FNPDMDEVPOWERON() function. */
    130130typedef FNPDMDEVPOWERON *PFNPDMDEVPOWERON;
    … …  
    138138 * @remarks Caller enters the device critical section.
    139139 */
    140 typedef DECLCALLBACK(void)  FNPDMDEVRESET(PPDMDEVINS pDevIns);
     140typedef DECLCALLBACKTYPE(void, FNPDMDEVRESET,(PPDMDEVINS pDevIns));
    141141/** Pointer to a FNPDMDEVRESET() function. */
    142142typedef FNPDMDEVRESET *PFNPDMDEVRESET;
    … …  
    154154 * @remarks Caller enters the device critical section.
    155155 */
    156 typedef DECLCALLBACK(void)  FNPDMDEVSOFTRESET(PPDMDEVINS pDevIns, uint32_t fFlags);
     156typedef DECLCALLBACKTYPE(void, FNPDMDEVSOFTRESET,(PPDMDEVINS pDevIns, uint32_t fFlags));
    157157/** Pointer to a FNPDMDEVSOFTRESET() function. */
    158158typedef FNPDMDEVSOFTRESET *PFNPDMDEVSOFTRESET;
    … …  
    189189 * @remarks Caller enters the device critical section.
    190190 */
    191 typedef DECLCALLBACK(void)  FNPDMDEVSUSPEND(PPDMDEVINS pDevIns);
     191typedef DECLCALLBACKTYPE(void, FNPDMDEVSUSPEND,(PPDMDEVINS pDevIns));
    192192/** Pointer to a FNPDMDEVSUSPEND() function. */
    193193typedef FNPDMDEVSUSPEND *PFNPDMDEVSUSPEND;
    … …  
    201201 * @remarks Caller enters the device critical section.
    202202 */
    203 typedef DECLCALLBACK(void)  FNPDMDEVRESUME(PPDMDEVINS pDevIns);
     203typedef DECLCALLBACKTYPE(void, FNPDMDEVRESUME,(PPDMDEVINS pDevIns));
    204204/** Pointer to a FNPDMDEVRESUME() function. */
    205205typedef FNPDMDEVRESUME *PFNPDMDEVRESUME;
    … …  
    216216 * @remarks Caller enters the device critical section.
    217217 */
    218 typedef DECLCALLBACK(void)   FNPDMDEVPOWEROFF(PPDMDEVINS pDevIns);
     218typedef DECLCALLBACKTYPE(void, FNPDMDEVPOWEROFF,(PPDMDEVINS pDevIns));
    219219/** Pointer to a FNPDMDEVPOWEROFF() function. */
    220220typedef FNPDMDEVPOWEROFF *PFNPDMDEVPOWEROFF;
    … …  
    236236 * @remarks Caller enters the device critical section.
    237237 */
    238 typedef DECLCALLBACK(int)  FNPDMDEVATTACH(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags);
     238typedef DECLCALLBACKTYPE(int, FNPDMDEVATTACH,(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags));
    239239/** Pointer to a FNPDMDEVATTACH() function. */
    240240typedef FNPDMDEVATTACH *PFNPDMDEVATTACH;
    … …  
    255255 * @remarks Caller enters the device critical section.
    256256 */
    257 typedef DECLCALLBACK(void)  FNPDMDEVDETACH(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags);
     257typedef DECLCALLBACKTYPE(void, FNPDMDEVDETACH,(PPDMDEVINS pDevIns, unsigned iLUN, uint32_t fFlags));
    258258/** Pointer to a FNPDMDEVDETACH() function. */
    259259typedef FNPDMDEVDETACH *PFNPDMDEVDETACH;
    … …  
    269269 * @remarks The device critical section is not entered.
    270270 */
    271 typedef DECLCALLBACK(int) FNPDMDEVQUERYINTERFACE(PPDMDEVINS pDevIns, unsigned iLUN, PPDMIBASE *ppBase);
     271typedef DECLCALLBACKTYPE(int, FNPDMDEVQUERYINTERFACE,(PPDMDEVINS pDevIns, unsigned iLUN, PPDMIBASE *ppBase));
    272272/** Pointer to a FNPDMDEVQUERYINTERFACE() function. */
    273273typedef FNPDMDEVQUERYINTERFACE *PFNPDMDEVQUERYINTERFACE;
    … …  
    284284 * @remarks Caller enters the device critical section.
    285285 */
    286 typedef DECLCALLBACK(int) FNPDMDEVINITCOMPLETE(PPDMDEVINS pDevIns);
     286typedef DECLCALLBACKTYPE(int, FNPDMDEVINITCOMPLETE,(PPDMDEVINS pDevIns));
    287287/** Pointer to a FNPDMDEVINITCOMPLETE() function. */
    288288typedef FNPDMDEVINITCOMPLETE *PFNPDMDEVINITCOMPLETE;
    … …  
    15301530     * @remarks Caller enters the PDM critical section.
    15311531     */
    1532     DECLCALLBACKMEMBER(void, pfnSetIrq)(PPDMDEVINS pDevIns, int iIrq, int iLevel, uint32_t uTagSrc);
     1532    DECLCALLBACKMEMBER(void, pfnSetIrq,(PPDMDEVINS pDevIns, int iIrq, int iLevel, uint32_t uTagSrc));
    15331533
    15341534    /**
    … …  
    15401540     * @remarks Caller enters the PDM critical section.
    15411541     */
    1542     DECLCALLBACKMEMBER(int, pfnGetInterrupt)(PPDMDEVINS pDevIns, uint32_t *puTagSrc);
     1542    DECLCALLBACKMEMBER(int, pfnGetInterrupt,(PPDMDEVINS pDevIns, uint32_t *puTagSrc));
    15431543
    15441544    /** Just a safety precaution. */
    … …  
    15641564     * @param   pDevIns         Device instance of the PIC.
    15651565     */
    1566     DECLCALLBACKMEMBER(void, pfnSetInterruptFF)(PPDMDEVINS pDevIns);
     1566    DECLCALLBACKMEMBER(void, pfnSetInterruptFF,(PPDMDEVINS pDevIns));
    15671567
    15681568    /**
    … …  
    15711571     * @param   pDevIns         Device instance of the PIC.
    15721572     */
    1573     DECLCALLBACKMEMBER(void, pfnClearInterruptFF)(PPDMDEVINS pDevIns);
     1573    DECLCALLBACKMEMBER(void, pfnClearInterruptFF,(PPDMDEVINS pDevIns));
    15741574
    15751575    /**
    … …  
    15811581     * @param   rc              What to return if we fail to acquire the lock.
    15821582     */
    1583     DECLCALLBACKMEMBER(int,   pfnLock)(PPDMDEVINS pDevIns, int rc);
     1583    DECLCALLBACKMEMBER(int, pfnLock,(PPDMDEVINS pDevIns, int rc));
    15841584
    15851585    /**
    … …  
    15881588     * @param   pDevIns         The PIC device instance.
    15891589     */
    1590     DECLCALLBACKMEMBER(void,  pfnUnlock)(PPDMDEVINS pDevIns);
     1590    DECLCALLBACKMEMBER(void, pfnUnlock,(PPDMDEVINS pDevIns));
    15911591
    15921592    /** Just a safety precaution. */
    … …  
    17161716     *          Actually, as per 2018-07-21 this isn't true (bird).
    17171717     */
    1718     DECLCALLBACKMEMBER(void, pfnSetIrq)(PPDMDEVINS pDevIns, PCIBDF uBusDevFn, int iIrq, int iLevel, uint32_t uTagSrc);
     1718    DECLCALLBACKMEMBER(void, pfnSetIrq,(PPDMDEVINS pDevIns, PCIBDF uBusDevFn, int iIrq, int iLevel, uint32_t uTagSrc));
    17191719
    17201720    /**
    … …  
    17301730     *          Actually, as per 2018-07-21 this isn't true (bird).
    17311731     */
    1732     DECLCALLBACKMEMBER(void, pfnSendMsi)(PPDMDEVINS pDevIns, PCIBDF uBusDevFn, PCMSIMSG pMsi, uint32_t uTagSrc);
     1732    DECLCALLBACKMEMBER(void, pfnSendMsi,(PPDMDEVINS pDevIns, PCIBDF uBusDevFn, PCMSIMSG pMsi, uint32_t uTagSrc));
    17331733
    17341734    /**
    … …  
    17451745     *          Actually, as per 2018-07-21 this isn't true (bird).
    17461746     */
    1747     DECLCALLBACKMEMBER(VBOXSTRICTRC, pfnSetEoi)(PPDMDEVINS pDevIns, uint8_t u8Vector);
     1747    DECLCALLBACKMEMBER(VBOXSTRICTRC, pfnSetEoi,(PPDMDEVINS pDevIns, uint8_t u8Vector));
    17481748
    17491749    /** Just a safety precaution. */
    … …  
    17801780     * @sa      APICBusDeliver()
    17811781     */
    1782     DECLCALLBACKMEMBER(int, pfnApicBusDeliver)(PPDMDEVINS pDevIns, uint8_t u8Dest, uint8_t u8DestMode, uint8_t u8DeliveryMode,
    1783                                                uint8_t uVector, uint8_t u8Polarity, uint8_t u8TriggerMode, uint32_t uTagSrc);
     1782    DECLCALLBACKMEMBER(int, pfnApicBusDeliver,(PPDMDEVINS pDevIns, uint8_t u8Dest, uint8_t u8DestMode, uint8_t u8DeliveryMode,
     1783                                               uint8_t uVector, uint8_t u8Polarity, uint8_t u8TriggerMode, uint32_t uTagSrc));
    17841784
    17851785    /**
    … …  
    17911791     * @param   rc              What to return if we fail to acquire the lock.
    17921792     */
    1793     DECLCALLBACKMEMBER(int,   pfnLock)(PPDMDEVINS pDevIns, int rc);
     1793    DECLCALLBACKMEMBER(int, pfnLock,(PPDMDEVINS pDevIns, int rc));
    17941794
    17951795    /**
    … …  
    17981798     * @param   pDevIns         The IOAPIC device instance.
    17991799     */
    1800     DECLCALLBACKMEMBER(void,  pfnUnlock)(PPDMDEVINS pDevIns);
     1800    DECLCALLBACKMEMBER(void, pfnUnlock,(PPDMDEVINS pDevIns));
    18011801
    18021802    /**
    … …  
    18111811     * @sa      iommuAmdDeviceMsiRemap().
    18121812     */
    1813     DECLCALLBACKMEMBER(int, pfnIommuMsiRemap)(PPDMDEVINS pDevIns, uint16_t uDevIt, PCMSIMSG pMsiIn, PMSIMSG pMsiOut);
     1813    DECLCALLBACKMEMBER(int, pfnIommuMsiRemap,(PPDMDEVINS pDevIns, uint16_t uDevIt, PCMSIMSG pMsiIn, PMSIMSG pMsiOut));
    18141814
    18151815    /** Just a safety precaution. */
    … …  
    20372037 * @remarks The device lock is not taken, however, the DMA device lock is held.
    20382038 */
    2039 typedef DECLCALLBACK(uint32_t) FNDMATRANSFERHANDLER(PPDMDEVINS pDevIns, void *pvUser, unsigned uChannel, uint32_t off, uint32_t cb);
     2039typedef DECLCALLBACKTYPE(uint32_t, FNDMATRANSFERHANDLER,(PPDMDEVINS pDevIns, void *pvUser, unsigned uChannel,
     2040                                                         uint32_t off, uint32_t cb));
    20402041/** Pointer to a FNDMATRANSFERHANDLER(). */
    20412042typedef FNDMATRANSFERHANDLER *PFNDMATRANSFERHANDLER;
    … …  
    82178218 * @param   u32Version      VBox version number.
    82188219 */
    8219 typedef DECLCALLBACK(int) FNPDMVBOXDEVICESREGISTER(PPDMDEVREGCB pCallbacks, uint32_t u32Version);
     8220typedef DECLCALLBACKTYPE(int, FNPDMVBOXDEVICESREGISTER,(PPDMDEVREGCB pCallbacks, uint32_t u32Version));
    82208221
    82218222/** @} */

  • trunk/include/VBox/vmm/pdmdrv.h

    r82968 r85121  
    7575 * @param   fFlags      Flags, combination of the PDM_TACH_FLAGS_* \#defines.
    7676 */
    77 typedef DECLCALLBACK(int)   FNPDMDRVCONSTRUCT(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags);
     77typedef DECLCALLBACKTYPE(int, FNPDMDRVCONSTRUCT,(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags));
    7878/** Pointer to a FNPDMDRVCONSTRUCT() function. */
    7979typedef FNPDMDRVCONSTRUCT *PFNPDMDRVCONSTRUCT;
    … …  
    8787 * @param   pDrvIns     The driver instance data.
    8888 */
    89 typedef DECLCALLBACK(void)   FNPDMDRVDESTRUCT(PPDMDRVINS pDrvIns);
     89typedef DECLCALLBACKTYPE(void, FNPDMDRVDESTRUCT,(PPDMDRVINS pDrvIns));
    9090/** Pointer to a FNPDMDRVDESTRUCT() function. */
    9191typedef FNPDMDRVDESTRUCT *PFNPDMDRVDESTRUCT;
    … …  
    107107 * @remark  A relocation CANNOT fail.
    108108 */
    109 typedef DECLCALLBACK(void) FNPDMDRVRELOCATE(PPDMDRVINS pDrvIns, RTGCINTPTR offDelta);
     109typedef DECLCALLBACKTYPE(void, FNPDMDRVRELOCATE,(PPDMDRVINS pDrvIns, RTGCINTPTR offDelta));
    110110/** Pointer to a FNPDMDRVRELOCATE() function. */
    111111typedef FNPDMDRVRELOCATE *PFNPDMDRVRELOCATE;
    … …  
    127127 * @param   pcbOut      Where to store the actual size of the output data.
    128128 */
    129 typedef DECLCALLBACK(int) FNPDMDRVIOCTL(PPDMDRVINS pDrvIns, uint32_t uFunction,
    130                                         void *pvIn, uint32_t cbIn,
    131                                         void *pvOut, uint32_t cbOut, uint32_t *pcbOut);
     129typedef DECLCALLBACKTYPE(int, FNPDMDRVIOCTL,(PPDMDRVINS pDrvIns, uint32_t uFunction,
     130                                             void *pvIn, uint32_t cbIn,
     131                                             void *pvOut, uint32_t cbOut, uint32_t *pcbOut));
    132132/** Pointer to a FNPDMDRVIOCTL() function. */
    133133typedef FNPDMDRVIOCTL *PFNPDMDRVIOCTL;
    … …  
    138138 * @param   pDrvIns     The driver instance data.
    139139 */
    140 typedef DECLCALLBACK(void)   FNPDMDRVPOWERON(PPDMDRVINS pDrvIns);
     140typedef DECLCALLBACKTYPE(void, FNPDMDRVPOWERON,(PPDMDRVINS pDrvIns));
    141141/** Pointer to a FNPDMDRVPOWERON() function. */
    142142typedef FNPDMDRVPOWERON *PFNPDMDRVPOWERON;
    … …  
    148148 * @param   pDrvIns     The driver instance data.
    149149 */
    150 typedef DECLCALLBACK(void)  FNPDMDRVRESET(PPDMDRVINS pDrvIns);
     150typedef DECLCALLBACKTYPE(void, FNPDMDRVRESET,(PPDMDRVINS pDrvIns));
    151151/** Pointer to a FNPDMDRVRESET() function. */
    152152typedef FNPDMDRVRESET *PFNPDMDRVRESET;
    … …  
    158158 * @param   pDrvIns     The driver instance data.
    159159 */
    160 typedef DECLCALLBACK(void)  FNPDMDRVSUSPEND(PPDMDRVINS pDrvIns);
     160typedef DECLCALLBACKTYPE(void, FNPDMDRVSUSPEND,(PPDMDRVINS pDrvIns));
    161161/** Pointer to a FNPDMDRVSUSPEND() function. */
    162162typedef FNPDMDRVSUSPEND *PFNPDMDRVSUSPEND;
    … …  
    168168 * @param   pDrvIns     The driver instance data.
    169169 */
    170 typedef DECLCALLBACK(void)  FNPDMDRVRESUME(PPDMDRVINS pDrvIns);
     170typedef DECLCALLBACKTYPE(void, FNPDMDRVRESUME,(PPDMDRVINS pDrvIns));
    171171/** Pointer to a FNPDMDRVRESUME() function. */
    172172typedef FNPDMDRVRESUME *PFNPDMDRVRESUME;
    … …  
    181181 * @param   pDrvIns     The driver instance data.
    182182 */
    183 typedef DECLCALLBACK(void)   FNPDMDRVPOWEROFF(PPDMDRVINS pDrvIns);
     183typedef DECLCALLBACKTYPE(void, FNPDMDRVPOWEROFF,(PPDMDRVINS pDrvIns));
    184184/** Pointer to a FNPDMDRVPOWEROFF() function. */
    185185typedef FNPDMDRVPOWEROFF *PFNPDMDRVPOWEROFF;
    … …  
    198198 * @param   fFlags      Flags, combination of the PDM_TACH_FLAGS_* \#defines.
    199199 */
    200 typedef DECLCALLBACK(int)  FNPDMDRVATTACH(PPDMDRVINS pDrvIns, uint32_t fFlags);
     200typedef DECLCALLBACKTYPE(int, FNPDMDRVATTACH,(PPDMDRVINS pDrvIns, uint32_t fFlags));
    201201/** Pointer to a FNPDMDRVATTACH() function. */
    202202typedef FNPDMDRVATTACH *PFNPDMDRVATTACH;
    … …  
    213213 * @param   fFlags      PDM_TACH_FLAGS_NOT_HOT_PLUG or 0.
    214214 */
    215 typedef DECLCALLBACK(void)  FNPDMDRVDETACH(PPDMDRVINS pDrvIns, uint32_t fFlags);
     215typedef DECLCALLBACKTYPE(void, FNPDMDRVDETACH,(PPDMDRVINS pDrvIns, uint32_t fFlags));
    216216/** Pointer to a FNPDMDRVDETACH() function. */
    217217typedef FNPDMDRVDETACH *PFNPDMDRVDETACH;
    … …  
    18641864 * @param   u32Version      VBox version number.
    18651865 */
    1866 typedef DECLCALLBACK(int) FNPDMVBOXDRIVERSREGISTER(PCPDMDRVREGCB pCallbacks, uint32_t u32Version);
     1866typedef DECLCALLBACKTYPE(int, FNPDMVBOXDRIVERSREGISTER,(PCPDMDRVREGCB pCallbacks, uint32_t u32Version));
    18671867
    18681868VMMR3DECL(int) PDMR3DrvStaticRegistration(PVM pVM, FNPDMVBOXDRIVERSREGISTER pfnCallback);

  • trunk/include/VBox/vmm/pdmpcidev.h

    r84509 r85121  
    5656 *          that is very likely be a lock order violation.
    5757 */
    58 typedef DECLCALLBACK(VBOXSTRICTRC) FNPCICONFIGREAD(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev,
    59                                                    uint32_t uAddress, unsigned cb, uint32_t *pu32Value);
     58typedef DECLCALLBACKTYPE(VBOXSTRICTRC, FNPCICONFIGREAD,(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev,
     59                                                        uint32_t uAddress, unsigned cb, uint32_t *pu32Value));
    6060/** Pointer to a FNPCICONFIGREAD() function. */
    6161typedef FNPCICONFIGREAD *PFNPCICONFIGREAD;
    … …  
    8181 *          that is very likely be a lock order violation.
    8282 */
    83 typedef DECLCALLBACK(VBOXSTRICTRC) FNPCICONFIGWRITE(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev,
    84                                                     uint32_t uAddress, unsigned cb, uint32_t u32Value);
     83typedef DECLCALLBACKTYPE(VBOXSTRICTRC, FNPCICONFIGWRITE,(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev,
     84                                                         uint32_t uAddress, unsigned cb, uint32_t u32Value));
    8585/** Pointer to a FNPCICONFIGWRITE() function. */
    8686typedef FNPCICONFIGWRITE *PFNPCICONFIGWRITE;
    … …  
    123123 *          that is very likely be a lock order violation.
    124124 */
    125 typedef DECLCALLBACK(int) FNPCIIOREGIONMAP(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, uint32_t iRegion,
    126                                            RTGCPHYS GCPhysAddress, RTGCPHYS cb, PCIADDRESSSPACE enmType);
     125typedef DECLCALLBACKTYPE(int, FNPCIIOREGIONMAP,(PPDMDEVINS pDevIns, PPDMPCIDEV pPciDev, uint32_t iRegion,
     126                                                RTGCPHYS GCPhysAddress, RTGCPHYS cb, PCIADDRESSSPACE enmType));
    127127/** Pointer to a FNPCIIOREGIONMAP() function. */
    128128typedef FNPCIIOREGIONMAP *PFNPCIIOREGIONMAP;
    … …  
    139139 * @param   enmType         Combination of the PCI_ADDRESS_SPACE_* values.
    140140 */
    141 typedef DECLCALLBACK(int) FNPCIIOREGIONOLDSETTER(PPDMPCIDEV pPciDev, uint32_t iRegion, RTGCPHYS cbRegion, PCIADDRESSSPACE enmType);
     141typedef DECLCALLBACKTYPE(int, FNPCIIOREGIONOLDSETTER,(PPDMPCIDEV pPciDev, uint32_t iRegion, RTGCPHYS cbRegion,
     142                                                      PCIADDRESSSPACE enmType));
    142143/** Pointer to a FNPCIIOREGIONOLDSETTER() function. */
    143144typedef FNPCIIOREGIONOLDSETTER *PFNPCIIOREGIONOLDSETTER;
    … …  
    153154 * @sa      @bugref{9359}
    154155 */
    155 typedef DECLCALLBACK(int) FNPCIIOREGIONSWAP(PPDMPCIDEV pPciDev, uint32_t iRegion, uint32_t iOtherRegion);
     156typedef DECLCALLBACKTYPE(int, FNPCIIOREGIONSWAP,(PPDMPCIDEV pPciDev, uint32_t iRegion, uint32_t iOtherRegion));
    156157/** Pointer to a FNPCIIOREGIONSWAP() function. */
    157158typedef FNPCIIOREGIONSWAP *PFNPCIIOREGIONSWAP;

  • trunk/include/VBox/vmm/pdmpcidevint.h

    r82968 r85121  
    8383 * @param   pu32Value       Where to return the register value.
    8484 */
    85 typedef DECLCALLBACK(VBOXSTRICTRC) FNPCIBRIDGECONFIGREAD(PPDMDEVINSR3 pDevIns, uint8_t iBus, uint8_t iDevice,
    86                                                          uint32_t u32Address, unsigned cb, uint32_t *pu32Value);
     85typedef DECLCALLBACKTYPE(VBOXSTRICTRC, FNPCIBRIDGECONFIGREAD,(PPDMDEVINSR3 pDevIns, uint8_t iBus, uint8_t iDevice,
     86                                                              uint32_t u32Address, unsigned cb, uint32_t *pu32Value));
    8787/** Pointer to a FNPCICONFIGREAD() function. */
    8888typedef FNPCIBRIDGECONFIGREAD *PFNPCIBRIDGECONFIGREAD;
    … …  
    102102 *                          this value is determined by the cb parameter.
    103103 */
    104 typedef DECLCALLBACK(VBOXSTRICTRC) FNPCIBRIDGECONFIGWRITE(PPDMDEVINSR3 pDevIns, uint8_t iBus, uint8_t iDevice,
    105                                                           uint32_t u32Address, unsigned cb, uint32_t u32Value);
     104typedef DECLCALLBACKTYPE(VBOXSTRICTRC, FNPCIBRIDGECONFIGWRITE,(PPDMDEVINSR3 pDevIns, uint8_t iBus, uint8_t iDevice,
     105                                                               uint32_t u32Address, unsigned cb, uint32_t u32Value));
    106106/** Pointer to a FNPCICONFIGWRITE() function. */
    107107typedef FNPCIBRIDGECONFIGWRITE *PFNPCIBRIDGECONFIGWRITE;

  • trunk/include/VBox/vmm/pdmqueue.h

    r82968 r85121  
    7878 *          that only one EMT will do queue callbacks at any one time.
    7979 */
    80 typedef DECLCALLBACK(bool) FNPDMQUEUEDEV(PPDMDEVINS pDevIns, PPDMQUEUEITEMCORE pItem);
     80typedef DECLCALLBACKTYPE(bool, FNPDMQUEUEDEV,(PPDMDEVINS pDevIns, PPDMQUEUEITEMCORE pItem));
    8181/** Pointer to a FNPDMQUEUEDEV(). */
    8282typedef FNPDMQUEUEDEV *PFNPDMQUEUEDEV;
    … …  
    9292 *          EMT will do queue callbacks at any one time.
    9393 */
    94 typedef DECLCALLBACK(bool) FNPDMQUEUEUSB(PPDMUSBINS pUsbIns, PPDMQUEUEITEMCORE pItem);
     94typedef DECLCALLBACKTYPE(bool, FNPDMQUEUEUSB,(PPDMUSBINS pUsbIns, PPDMQUEUEITEMCORE pItem));
    9595/** Pointer to a FNPDMQUEUEUSB(). */
    9696typedef FNPDMQUEUEUSB *PFNPDMQUEUEUSB;
    … …  
    106106 *          EMT will do queue callbacks at any one time.
    107107 */
    108 typedef DECLCALLBACK(bool) FNPDMQUEUEDRV(PPDMDRVINS pDrvIns, PPDMQUEUEITEMCORE pItem);
     108typedef DECLCALLBACKTYPE(bool, FNPDMQUEUEDRV,(PPDMDRVINS pDrvIns, PPDMQUEUEITEMCORE pItem));
    109109/** Pointer to a FNPDMQUEUEDRV(). */
    110110typedef FNPDMQUEUEDRV *PFNPDMQUEUEDRV;
    … …  
    120120 *          EMT will do queue callbacks at any one time.
    121121 */
    122 typedef DECLCALLBACK(bool) FNPDMQUEUEINT(PVM pVM, PPDMQUEUEITEMCORE pItem);
     122typedef DECLCALLBACKTYPE(bool, FNPDMQUEUEINT,(PVM pVM, PPDMQUEUEITEMCORE pItem));
    123123/** Pointer to a FNPDMQUEUEINT(). */
    124124typedef FNPDMQUEUEINT *PFNPDMQUEUEINT;
    … …  
    134134 *          EMT will do queue callbacks at any one time.
    135135 */
    136 typedef DECLCALLBACK(bool) FNPDMQUEUEEXT(void *pvUser, PPDMQUEUEITEMCORE pItem);
     136typedef DECLCALLBACKTYPE(bool, FNPDMQUEUEEXT,(void *pvUser, PPDMQUEUEITEMCORE pItem));
    137137/** Pointer to a FNPDMQUEUEEXT(). */
    138138typedef FNPDMQUEUEEXT *PFNPDMQUEUEEXT;

  • trunk/include/VBox/vmm/pdmsrv.h

    r82968 r85121  
    5353 *                      usage is expected in this function it is passed as a parameter.
    5454 */
    55 typedef DECLCALLBACK(int)   FNPDMSRVCONSTRUCT(PPDMSRVINS pSrvIns, PCFGMNODE pCfg);
     55typedef DECLCALLBACKTYPE(int, FNPDMSRVCONSTRUCT,(PPDMSRVINS pSrvIns, PCFGMNODE pCfg));
    5656/** Pointer to a FNPDMSRVCONSTRUCT() function. */
    5757typedef FNPDMSRVCONSTRUCT *PFNPDMSRVCONSTRUCT;
    … …  
    6565 * @param   pSrvIns     The service instance data.
    6666 */
    67 typedef DECLCALLBACK(void)   FNPDMSRVDESTRUCT(PPDMSRVINS pSrvIns);
     67typedef DECLCALLBACKTYPE(void, FNPDMSRVDESTRUCT,(PPDMSRVINS pSrvIns));
    6868/** Pointer to a FNPDMSRVDESTRUCT() function. */
    6969typedef FNPDMSRVDESTRUCT *PFNPDMSRVDESTRUCT;
    … …  
    7474 * @param   pSrvIns     The service instance data.
    7575 */
    76 typedef DECLCALLBACK(void)   FNPDMSRVPOWERON(PPDMSRVINS pSrvIns);
     76typedef DECLCALLBACKTYPE(void, FNPDMSRVPOWERON,(PPDMSRVINS pSrvIns));
    7777/** Pointer to a FNPDMSRVPOWERON() function. */
    7878typedef FNPDMSRVPOWERON *PFNPDMSRVPOWERON;
    … …  
    8484 * @param   pSrvIns     The service instance data.
    8585 */
    86 typedef DECLCALLBACK(void)  FNPDMSRVRESET(PPDMSRVINS pSrvIns);
     86typedef DECLCALLBACKTYPE(void, FNPDMSRVRESET,(PPDMSRVINS pSrvIns));
    8787/** Pointer to a FNPDMSRVRESET() function. */
    8888typedef FNPDMSRVRESET *PFNPDMSRVRESET;
    … …  
    9494 * @param   pSrvIns     The service instance data.
    9595 */
    96 typedef DECLCALLBACK(void)  FNPDMSRVSUSPEND(PPDMSRVINS pSrvIns);
     96typedef DECLCALLBACKTYPE(void, FNPDMSRVSUSPEND,(PPDMSRVINS pSrvIns));
    9797/** Pointer to a FNPDMSRVSUSPEND() function. */
    9898typedef FNPDMSRVSUSPEND *PFNPDMSRVSUSPEND;
    … …  
    104104 * @param   pSrvIns     The service instance data.
    105105 */
    106 typedef DECLCALLBACK(void)  FNPDMSRVRESUME(PPDMSRVINS pSrvIns);
     106typedef DECLCALLBACKTYPE(void, FNPDMSRVRESUME,(PPDMSRVINS pSrvIns));
    107107/** Pointer to a FNPDMSRVRESUME() function. */
    108108typedef FNPDMSRVRESUME *PFNPDMSRVRESUME;
    … …  
    113113 * @param   pSrvIns     The service instance data.
    114114 */
    115 typedef DECLCALLBACK(void)   FNPDMSRVPOWEROFF(PPDMSRVINS pSrvIns);
     115typedef DECLCALLBACKTYPE(void, FNPDMSRVPOWEROFF,(PPDMSRVINS pSrvIns));
    116116/** Pointer to a FNPDMSRVPOWEROFF() function. */
    117117typedef FNPDMSRVPOWEROFF *PFNPDMSRVPOWEROFF;
    … …  
    124124 * @param   pSrvIns     The service instance data.
    125125 */
    126 typedef DECLCALLBACK(void)  FNPDMSRVDETACH(PPDMSRVINS pSrvIns, PPDMDEVINS pDevIns, PPDMDRVINS pDrvIns);
     126typedef DECLCALLBACKTYPE(void, FNPDMSRVDETACH,(PPDMSRVINS pSrvIns, PPDMDEVINS pDevIns, PPDMDRVINS pDrvIns));
    127127/** Pointer to a FNPDMSRVDETACH() function. */
    128128typedef FNPDMSRVDETACH *PFNPDMSRVDETACH;
    … …  
    329329 * @param   u32Version      VBox version number.
    330330 */
    331 typedef DECLCALLBACK(int) FNPDMVBOXSERVICESREGISTER(PPDMSRVREGCB pCallbacks, uint32_t u32Version);
     331typedef DECLCALLBACKTYPE(int, FNPDMVBOXSERVICESREGISTER,(PPDMSRVREGCB pCallbacks, uint32_t u32Version));
    332332
    333333

  • trunk/include/VBox/vmm/pdmstorageifs.h

    r82968 r85121  
    144144 * @param   uPercent        Completion percentage.
    145145 */
    146 typedef DECLCALLBACK(int) FNSIMPLEPROGRESS(void *pvUser, unsigned uPercentage);
     146typedef DECLCALLBACKTYPE(int, FNSIMPLEPROGRESS,(void *pvUser, unsigned uPercentage));
    147147/** Pointer to FNSIMPLEPROGRESS() */
    148148typedef FNSIMPLEPROGRESS *PFNSIMPLEPROGRESS;

  • trunk/include/VBox/vmm/pdmtask.h

    r82968 r85121  
    5858 *          callback.  No other locks will be held either.
    5959 */
    60 typedef DECLCALLBACK(void) FNPDMTASKDEV(PPDMDEVINS pDevIns, void *pvUser);
     60typedef DECLCALLBACKTYPE(void, FNPDMTASKDEV,(PPDMDEVINS pDevIns, void *pvUser));
    6161/** Pointer to a FNPDMTASKDEV(). */
    6262typedef FNPDMTASKDEV *PFNPDMTASKDEV;
    … …  
    7070 * @remarks No other locks will be held.
    7171 */
    72 typedef DECLCALLBACK(void) FNPDMTASKDRV(PPDMDRVINS pDrvIns, void *pvUser);
     72typedef DECLCALLBACKTYPE(void, FNPDMTASKDRV,(PPDMDRVINS pDrvIns, void *pvUser));
    7373/** Pointer to a FNPDMTASKDRV(). */
    7474typedef FNPDMTASKDRV *PFNPDMTASKDRV;
    … …  
    8282 * @remarks No other locks will be held.
    8383 */
    84 typedef DECLCALLBACK(void) FNPDMTASKUSB(PPDMUSBINS pUsbIns, void *pvUser);
     84typedef DECLCALLBACKTYPE(void, FNPDMTASKUSB,(PPDMUSBINS pUsbIns, void *pvUser));
    8585/** Pointer to a FNPDMTASKUSB(). */
    8686typedef FNPDMTASKUSB *PFNPDMTASKUSB;
    … …  
    9494 * @remarks No other locks will be held.
    9595 */
    96 typedef DECLCALLBACK(void) FNPDMTASKINT(PVM pVM, void *pvUser);
     96typedef DECLCALLBACKTYPE(void, FNPDMTASKINT,(PVM pVM, void *pvUser));
    9797/** Pointer to a FNPDMTASKINT(). */
    9898typedef FNPDMTASKINT *PFNPDMTASKINT;

  • trunk/include/VBox/vmm/pdmthread.h

    r82968 r85121  
    9494 * @param   pThread     The PDM thread data.
    9595 */
    96 typedef DECLCALLBACK(int) FNPDMTHREADDEV(PPDMDEVINS pDevIns, PPDMTHREAD pThread);
     96typedef DECLCALLBACKTYPE(int, FNPDMTHREADDEV,(PPDMDEVINS pDevIns, PPDMTHREAD pThread));
    9797/** Pointer to a FNPDMTHREADDEV(). */
    9898typedef FNPDMTHREADDEV *PFNPDMTHREADDEV;
    … …  
    105105 * @param   pThread     The PDM thread data.
    106106 */
    107 typedef DECLCALLBACK(int) FNPDMTHREADUSB(PPDMUSBINS pUsbIns, PPDMTHREAD pThread);
     107typedef DECLCALLBACKTYPE(int, FNPDMTHREADUSB,(PPDMUSBINS pUsbIns, PPDMTHREAD pThread));
    108108/** Pointer to a FNPDMTHREADUSB(). */
    109109typedef FNPDMTHREADUSB *PFNPDMTHREADUSB;
    … …  
    116116 * @param   pThread     The PDM thread data.
    117117 */
    118 typedef DECLCALLBACK(int) FNPDMTHREADDRV(PPDMDRVINS pDrvIns, PPDMTHREAD pThread);
     118typedef DECLCALLBACKTYPE(int, FNPDMTHREADDRV,(PPDMDRVINS pDrvIns, PPDMTHREAD pThread));
    119119/** Pointer to a FNPDMTHREADDRV(). */
    120120typedef FNPDMTHREADDRV *PFNPDMTHREADDRV;
    … …  
    127127 * @param   pThread     The PDM thread data.
    128128 */
    129 typedef DECLCALLBACK(int) FNPDMTHREADINT(PVM pVM, PPDMTHREAD pThread);
     129typedef DECLCALLBACKTYPE(int, FNPDMTHREADINT,(PVM pVM, PPDMTHREAD pThread));
    130130/** Pointer to a FNPDMTHREADINT(). */
    131131typedef FNPDMTHREADINT *PFNPDMTHREADINT;
    … …  
    150150 * @param   pThread     The PDM thread data.
    151151 */
    152 typedef DECLCALLBACK(int) FNPDMTHREADWAKEUPDEV(PPDMDEVINS pDevIns, PPDMTHREAD pThread);
     152typedef DECLCALLBACKTYPE(int, FNPDMTHREADWAKEUPDEV,(PPDMDEVINS pDevIns, PPDMTHREAD pThread));
    153153/** Pointer to a FNPDMTHREADDEV(). */
    154154typedef FNPDMTHREADWAKEUPDEV *PFNPDMTHREADWAKEUPDEV;
    … …  
    161161 * @param   pThread     The PDM thread data.
    162162 */
    163 typedef DECLCALLBACK(int) FNPDMTHREADWAKEUPUSB(PPDMUSBINS pUsbIns, PPDMTHREAD pThread);
     163typedef DECLCALLBACKTYPE(int, FNPDMTHREADWAKEUPUSB,(PPDMUSBINS pUsbIns, PPDMTHREAD pThread));
    164164/** Pointer to a FNPDMTHREADUSB(). */
    165165typedef FNPDMTHREADWAKEUPUSB *PFNPDMTHREADWAKEUPUSB;
    … …  
    172172 * @param   pThread     The PDM thread data.
    173173 */
    174 typedef DECLCALLBACK(int) FNPDMTHREADWAKEUPDRV(PPDMDRVINS pDrvIns, PPDMTHREAD pThread);
     174typedef DECLCALLBACKTYPE(int, FNPDMTHREADWAKEUPDRV,(PPDMDRVINS pDrvIns, PPDMTHREAD pThread));
    175175/** Pointer to a FNPDMTHREADDRV(). */
    176176typedef FNPDMTHREADWAKEUPDRV *PFNPDMTHREADWAKEUPDRV;
    … …  
    183183 * @param   pThread     The PDM thread data.
    184184 */
    185 typedef DECLCALLBACK(int) FNPDMTHREADWAKEUPINT(PVM pVM, PPDMTHREAD pThread);
     185typedef DECLCALLBACKTYPE(int, FNPDMTHREADWAKEUPINT,(PVM pVM, PPDMTHREAD pThread));
    186186/** Pointer to a FNPDMTHREADWAKEUPINT(). */
    187187typedef FNPDMTHREADWAKEUPINT *PFNPDMTHREADWAKEUPINT;

  • trunk/include/VBox/vmm/pdmusb.h

    r82968 r85121  
    10731073 * @param   u32Version      VBox version number.
    10741074 */
    1075 typedef DECLCALLBACK(int) FNPDMVBOXUSBREGISTER(PCPDMUSBREGCB pCallbacks, uint32_t u32Version);
     1075typedef DECLCALLBACKTYPE(int, FNPDMVBOXUSBREGISTER,(PCPDMUSBREGCB pCallbacks, uint32_t u32Version));
    10761076
    10771077VMMR3DECL(int)  PDMR3UsbCreateEmulatedDevice(PUVM pUVM, const char *pszDeviceName, PCFGMNODE pDeviceNode, PCRTUUID pUuid,

  • trunk/include/VBox/vmm/pgm.h

    r82968 r85121  
    8181 *          indicator. Relocation can not fail!
    8282 */
    83 typedef DECLCALLBACK(bool) FNPGMRELOCATE(PVM pVM, RTGCPTR GCPtrOld, RTGCPTR GCPtrNew, PGMRELOCATECALL enmMode, void *pvUser);
     83typedef DECLCALLBACKTYPE(bool, FNPGMRELOCATE,(PVM pVM, RTGCPTR GCPtrOld, RTGCPTR GCPtrNew, PGMRELOCATECALL enmMode, void *pvUser));
    8484/** Pointer to a relocation callback function. */
    8585typedef FNPGMRELOCATE *PFNPGMRELOCATE;
    … …  
    203203 * @thread  EMT(pVCpu)
    204204 */
    205 typedef DECLCALLBACK(VBOXSTRICTRC) FNPGMRZPHYSPFHANDLER(PVMCC pVM, PVMCPUCC pVCpu, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame,
    206                                                         RTGCPTR pvFault, RTGCPHYS GCPhysFault, void *pvUser);
     205typedef DECLCALLBACKTYPE(VBOXSTRICTRC, FNPGMRZPHYSPFHANDLER,(PVMCC pVM, PVMCPUCC pVCpu, RTGCUINT uErrorCode, PCPUMCTXCORE pRegFrame,
     206                                                             RTGCPTR pvFault, RTGCPHYS GCPhysFault, void *pvUser));
    207207/** Pointer to PGM access callback. */
    208208typedef FNPGMRZPHYSPFHANDLER *PFNPGMRZPHYSPFHANDLER;
    … …  
    234234 * @thread  EMT(pVCpu)
    235235 */
    236 typedef DECLCALLBACK(VBOXSTRICTRC) FNPGMPHYSHANDLER(PVMCC pVM, PVMCPUCC pVCpu, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf,
    237                                                     PGMACCESSTYPE enmAccessType, PGMACCESSORIGIN enmOrigin, void *pvUser);
     236typedef DECLCALLBACKTYPE(VBOXSTRICTRC, FNPGMPHYSHANDLER,(PVMCC pVM, PVMCPUCC pVCpu, RTGCPHYS GCPhys, void *pvPhys,
     237                                                         void *pvBuf, size_t cbBuf, PGMACCESSTYPE enmAccessType,
     238                                                         PGMACCESSORIGIN enmOrigin, void *pvUser));
    238239/** Pointer to PGM access callback. */
    239240typedef FNPGMPHYSHANDLER *PFNPGMPHYSHANDLER;
    … …  
    611612 * @param   pvUser      Callback user argument.
    612613 */
    613 typedef DECLCALLBACK(int) FNPGMPHYSNEMCHECKPAGE(PVMCC pVM, PVMCPUCC pVCpu, RTGCPHYS GCPhys, PPGMPHYSNEMPAGEINFO pInfo, void *pvUser);
     614typedef DECLCALLBACKTYPE(int, FNPGMPHYSNEMCHECKPAGE,(PVMCC pVM, PVMCPUCC pVCpu, RTGCPHYS GCPhys, PPGMPHYSNEMPAGEINFO pInfo, void *pvUser));
    614615/** Pointer to a FNPGMPHYSNEMCHECKPAGE function. */
    615616typedef FNPGMPHYSNEMCHECKPAGE *PFNPGMPHYSNEMCHECKPAGE;
    … …  
    630631 * @param   pvUser      The user argument.
    631632 */
    632 typedef DECLCALLBACK(int) FNPGMPHYSNEMENUMCALLBACK(PVMCC pVM, PVMCPUCC pVCpu, RTGCPHYS GCPhys, uint8_t *pu2NemState, void *pvUser);
     633typedef DECLCALLBACKTYPE(int, FNPGMPHYSNEMENUMCALLBACK,(PVMCC pVM, PVMCPUCC pVCpu, RTGCPHYS GCPhys,
     634                                                        uint8_t *pu2NemState, void *pvUser));
    633635/** Pointer to a FNPGMPHYSNEMENUMCALLBACK function. */
    634636typedef FNPGMPHYSNEMENUMCALLBACK *PFNPGMPHYSNEMENUMCALLBACK;

  • trunk/include/VBox/vmm/ssm.h

    r83776 r85121  
    117117 *                          SSMR3PutStructEx.
    118118 */
    119 typedef DECLCALLBACK(int) FNSSMFIELDGETPUT(PSSMHANDLE pSSM, const struct SSMFIELD *pField, void *pvStruct,
    120                                            uint32_t fFlags, bool fGetOrPut, void *pvUser);
     119typedef DECLCALLBACKTYPE(int, FNSSMFIELDGETPUT,(PSSMHANDLE pSSM, const struct SSMFIELD *pField, void *pvStruct,
     120                                                uint32_t fFlags, bool fGetOrPut, void *pvUser));
    121121/** Pointer to a SSMFIELD Get/Put callback. */
    122122typedef FNSSMFIELDGETPUT *PFNSSMFIELDGETPUT;
    … …  
    422422 * @thread  Any.
    423423 */
    424 typedef DECLCALLBACK(int) FNSSMDEVLIVEPREP(PPDMDEVINS pDevIns, PSSMHANDLE pSSM);
     424typedef DECLCALLBACKTYPE(int, FNSSMDEVLIVEPREP,(PPDMDEVINS pDevIns, PSSMHANDLE pSSM));
    425425/** Pointer to a FNSSMDEVLIVEPREP() function. */
    426426typedef FNSSMDEVLIVEPREP *PFNSSMDEVLIVEPREP;
    … …  
    439439 * @thread  Any.
    440440 */
    441 typedef DECLCALLBACK(int) FNSSMDEVLIVEEXEC(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uPass);
     441typedef DECLCALLBACKTYPE(int, FNSSMDEVLIVEEXEC,(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uPass));
    442442/** Pointer to a FNSSMDEVLIVEEXEC() function. */
    443443typedef FNSSMDEVLIVEEXEC *PFNSSMDEVLIVEEXEC;
    … …  
    462462 * @thread  Any.
    463463 */
    464 typedef DECLCALLBACK(int) FNSSMDEVLIVEVOTE(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uPass);
     464typedef DECLCALLBACKTYPE(int, FNSSMDEVLIVEVOTE,(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uPass));
    465465/** Pointer to a FNSSMDEVLIVEVOTE() function. */
    466466typedef FNSSMDEVLIVEVOTE *PFNSSMDEVLIVEVOTE;
    … …  
    474474 * @remarks The caller enters the device critical section prior to the call.
    475475 */
    476 typedef DECLCALLBACK(int) FNSSMDEVSAVEPREP(PPDMDEVINS pDevIns, PSSMHANDLE pSSM);
     476typedef DECLCALLBACKTYPE(int, FNSSMDEVSAVEPREP,(PPDMDEVINS pDevIns, PSSMHANDLE pSSM));
    477477/** Pointer to a FNSSMDEVSAVEPREP() function. */
    478478typedef FNSSMDEVSAVEPREP *PFNSSMDEVSAVEPREP;
    … …  
    486486 * @remarks The caller enters the device critical section prior to the call.
    487487 */
    488 typedef DECLCALLBACK(int) FNSSMDEVSAVEEXEC(PPDMDEVINS pDevIns, PSSMHANDLE pSSM);
     488typedef DECLCALLBACKTYPE(int, FNSSMDEVSAVEEXEC,(PPDMDEVINS pDevIns, PSSMHANDLE pSSM));
    489489/** Pointer to a FNSSMDEVSAVEEXEC() function. */
    490490typedef FNSSMDEVSAVEEXEC *PFNSSMDEVSAVEEXEC;
    … …  
    498498 * @remarks The caller enters the device critical section prior to the call.
    499499 */
    500 typedef DECLCALLBACK(int) FNSSMDEVSAVEDONE(PPDMDEVINS pDevIns, PSSMHANDLE pSSM);
     500typedef DECLCALLBACKTYPE(int, FNSSMDEVSAVEDONE,(PPDMDEVINS pDevIns, PSSMHANDLE pSSM));
    501501/** Pointer to a FNSSMDEVSAVEDONE() function. */
    502502typedef FNSSMDEVSAVEDONE *PFNSSMDEVSAVEDONE;
    … …  
    510510 * @remarks The caller enters the device critical section prior to the call.
    511511 */
    512 typedef DECLCALLBACK(int) FNSSMDEVLOADPREP(PPDMDEVINS pDevIns, PSSMHANDLE pSSM);
     512typedef DECLCALLBACKTYPE(int, FNSSMDEVLOADPREP,(PPDMDEVINS pDevIns, PSSMHANDLE pSSM));
    513513/** Pointer to a FNSSMDEVLOADPREP() function. */
    514514typedef FNSSMDEVLOADPREP *PFNSSMDEVLOADPREP;
    … …  
    525525 * @remarks The caller enters the device critical section prior to the call.
    526526 */
    527 typedef DECLCALLBACK(int) FNSSMDEVLOADEXEC(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass);
     527typedef DECLCALLBACKTYPE(int, FNSSMDEVLOADEXEC,(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass));
    528528/** Pointer to a FNSSMDEVLOADEXEC() function. */
    529529typedef FNSSMDEVLOADEXEC *PFNSSMDEVLOADEXEC;
    … …  
    537537 * @remarks The caller enters the device critical section prior to the call.
    538538 */
    539 typedef DECLCALLBACK(int) FNSSMDEVLOADDONE(PPDMDEVINS pDevIns, PSSMHANDLE pSSM);
     539typedef DECLCALLBACKTYPE(int, FNSSMDEVLOADDONE,(PPDMDEVINS pDevIns, PSSMHANDLE pSSM));
    540540/** Pointer to a FNSSMDEVLOADDONE() function. */
    541541typedef FNSSMDEVLOADDONE *PFNSSMDEVLOADDONE;
    … …  
    557557 * @thread  Any.
    558558 */
    559 typedef DECLCALLBACK(int) FNSSMUSBLIVEPREP(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM);
     559typedef DECLCALLBACKTYPE(int, FNSSMUSBLIVEPREP,(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM));
    560560/** Pointer to a FNSSMUSBLIVEPREP() function. */
    561561typedef FNSSMUSBLIVEPREP *PFNSSMUSBLIVEPREP;
    … …  
    574574 * @thread  Any.
    575575 */
    576 typedef DECLCALLBACK(int) FNSSMUSBLIVEEXEC(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM, uint32_t uPass);
     576typedef DECLCALLBACKTYPE(int, FNSSMUSBLIVEEXEC,(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM, uint32_t uPass));
    577577/** Pointer to a FNSSMUSBLIVEEXEC() function. */
    578578typedef FNSSMUSBLIVEEXEC *PFNSSMUSBLIVEEXEC;
    … …  
    597597 * @thread  Any.
    598598 */
    599 typedef DECLCALLBACK(int) FNSSMUSBLIVEVOTE(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM, uint32_t uPass);
     599typedef DECLCALLBACKTYPE(int, FNSSMUSBLIVEVOTE,(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM, uint32_t uPass));
    600600/** Pointer to a FNSSMUSBLIVEVOTE() function. */
    601601typedef FNSSMUSBLIVEVOTE *PFNSSMUSBLIVEVOTE;
    … …  
    609609 * @param   pSSM            SSM operation handle.
    610610 */
    611 typedef DECLCALLBACK(int) FNSSMUSBSAVEPREP(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM);
     611typedef DECLCALLBACKTYPE(int, FNSSMUSBSAVEPREP,(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM));
    612612/** Pointer to a FNSSMUSBSAVEPREP() function. */
    613613typedef FNSSMUSBSAVEPREP *PFNSSMUSBSAVEPREP;
    … …  
    621621 * @param   pSSM            SSM operation handle.
    622622 */
    623 typedef DECLCALLBACK(int) FNSSMUSBSAVEEXEC(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM);
     623typedef DECLCALLBACKTYPE(int, FNSSMUSBSAVEEXEC,(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM));
    624624/** Pointer to a FNSSMUSBSAVEEXEC() function. */
    625625typedef FNSSMUSBSAVEEXEC *PFNSSMUSBSAVEEXEC;
    … …  
    633633 * @param   pSSM            SSM operation handle.
    634634 */
    635 typedef DECLCALLBACK(int) FNSSMUSBSAVEDONE(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM);
     635typedef DECLCALLBACKTYPE(int, FNSSMUSBSAVEDONE,(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM));
    636636/** Pointer to a FNSSMUSBSAVEDONE() function. */
    637637typedef FNSSMUSBSAVEDONE *PFNSSMUSBSAVEDONE;
    … …  
    645645 * @param   pSSM            SSM operation handle.
    646646 */
    647 typedef DECLCALLBACK(int) FNSSMUSBLOADPREP(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM);
     647typedef DECLCALLBACKTYPE(int, FNSSMUSBLOADPREP,(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM));
    648648/** Pointer to a FNSSMUSBLOADPREP() function. */
    649649typedef FNSSMUSBLOADPREP *PFNSSMUSBLOADPREP;
    … …  
    660660 *                          that doesn't specify a pfnSaveLive callback.
    661661 */
    662 typedef DECLCALLBACK(int) FNSSMUSBLOADEXEC(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass);
     662typedef DECLCALLBACKTYPE(int, FNSSMUSBLOADEXEC,(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass));
    663663/** Pointer to a FNSSMUSBLOADEXEC() function. */
    664664typedef FNSSMUSBLOADEXEC *PFNSSMUSBLOADEXEC;
    … …  
    672672 * @param   pSSM            SSM operation handle.
    673673 */
    674 typedef DECLCALLBACK(int) FNSSMUSBLOADDONE(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM);
     674typedef DECLCALLBACKTYPE(int, FNSSMUSBLOADDONE,(PPDMUSBINS pUsbIns, PSSMHANDLE pSSM));
    675675/** Pointer to a FNSSMUSBLOADDONE() function. */
    676676typedef FNSSMUSBLOADDONE *PFNSSMUSBLOADDONE;
    … …  
    692692 * @thread  Any.
    693693 */
    694 typedef DECLCALLBACK(int) FNSSMDRVLIVEPREP(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM);
     694typedef DECLCALLBACKTYPE(int, FNSSMDRVLIVEPREP,(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM));
    695695/** Pointer to a FNSSMDRVLIVEPREP() function. */
    696696typedef FNSSMDRVLIVEPREP *PFNSSMDRVLIVEPREP;
    … …  
    709709 * @thread  Any.
    710710 */
    711 typedef DECLCALLBACK(int) FNSSMDRVLIVEEXEC(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM, uint32_t uPass);
     711typedef DECLCALLBACKTYPE(int, FNSSMDRVLIVEEXEC,(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM, uint32_t uPass));
    712712/** Pointer to a FNSSMDRVLIVEEXEC() function. */
    713713typedef FNSSMDRVLIVEEXEC *PFNSSMDRVLIVEEXEC;
    … …  
    732732 * @thread  Any.
    733733 */
    734 typedef DECLCALLBACK(int) FNSSMDRVLIVEVOTE(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM, uint32_t uPass);
     734typedef DECLCALLBACKTYPE(int, FNSSMDRVLIVEVOTE,(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM, uint32_t uPass));
    735735/** Pointer to a FNSSMDRVLIVEVOTE() function. */
    736736typedef FNSSMDRVLIVEVOTE *PFNSSMDRVLIVEVOTE;
    … …  
    744744 * @param   pSSM            SSM operation handle.
    745745 */
    746 typedef DECLCALLBACK(int) FNSSMDRVSAVEPREP(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM);
     746typedef DECLCALLBACKTYPE(int, FNSSMDRVSAVEPREP,(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM));
    747747/** Pointer to a FNSSMDRVSAVEPREP() function. */
    748748typedef FNSSMDRVSAVEPREP *PFNSSMDRVSAVEPREP;
    … …  
    755755 * @param   pSSM            SSM operation handle.
    756756 */
    757 typedef DECLCALLBACK(int) FNSSMDRVSAVEEXEC(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM);
     757typedef DECLCALLBACKTYPE(int, FNSSMDRVSAVEEXEC,(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM));
    758758/** Pointer to a FNSSMDRVSAVEEXEC() function. */
    759759typedef FNSSMDRVSAVEEXEC *PFNSSMDRVSAVEEXEC;
    … …  
    766766 * @param   pSSM            SSM operation handle.
    767767 */
    768 typedef DECLCALLBACK(int) FNSSMDRVSAVEDONE(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM);
     768typedef DECLCALLBACKTYPE(int, FNSSMDRVSAVEDONE,(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM));
    769769/** Pointer to a FNSSMDRVSAVEDONE() function. */
    770770typedef FNSSMDRVSAVEDONE *PFNSSMDRVSAVEDONE;
    … …  
    777777 * @param   pSSM            SSM operation handle.
    778778 */
    779 typedef DECLCALLBACK(int) FNSSMDRVLOADPREP(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM);
     779typedef DECLCALLBACKTYPE(int, FNSSMDRVLOADPREP,(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM));
    780780/** Pointer to a FNSSMDRVLOADPREP() function. */
    781781typedef FNSSMDRVLOADPREP *PFNSSMDRVLOADPREP;
    … …  
    791791 *                          that doesn't specify a pfnSaveLive callback.
    792792 */
    793 typedef DECLCALLBACK(int) FNSSMDRVLOADEXEC(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass);
     793typedef DECLCALLBACKTYPE(int, FNSSMDRVLOADEXEC,(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass));
    794794/** Pointer to a FNSSMDRVLOADEXEC() function. */
    795795typedef FNSSMDRVLOADEXEC *PFNSSMDRVLOADEXEC;
    … …  
    802802 * @param   pSSM            SSM operation handle.
    803803 */
    804 typedef DECLCALLBACK(int) FNSSMDRVLOADDONE(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM);
     804typedef DECLCALLBACKTYPE(int, FNSSMDRVLOADDONE,(PPDMDRVINS pDrvIns, PSSMHANDLE pSSM));
    805805/** Pointer to a FNSSMDRVLOADDONE() function. */
    806806typedef FNSSMDRVLOADDONE *PFNSSMDRVLOADDONE;
    … …  
    822822 * @thread  Any.
    823823 */
    824 typedef DECLCALLBACK(int) FNSSMINTLIVEPREP(PVM pVM, PSSMHANDLE pSSM);
     824typedef DECLCALLBACKTYPE(int, FNSSMINTLIVEPREP,(PVM pVM, PSSMHANDLE pSSM));
    825825/** Pointer to a FNSSMINTLIVEPREP() function. */
    826826typedef FNSSMINTLIVEPREP *PFNSSMINTLIVEPREP;
    … …  
    838838 * @thread  Any.
    839839 */
    840 typedef DECLCALLBACK(int) FNSSMINTLIVEEXEC(PVM pVM, PSSMHANDLE pSSM, uint32_t uPass);
     840typedef DECLCALLBACKTYPE(int, FNSSMINTLIVEEXEC,(PVM pVM, PSSMHANDLE pSSM, uint32_t uPass));
    841841/** Pointer to a FNSSMINTLIVEEXEC() function. */
    842842typedef FNSSMINTLIVEEXEC *PFNSSMINTLIVEEXEC;
    … …  
    860860 * @thread  Any.
    861861 */
    862 typedef DECLCALLBACK(int) FNSSMINTLIVEVOTE(PVM pVM, PSSMHANDLE pSSM, uint32_t uPass);
     862typedef DECLCALLBACKTYPE(int, FNSSMINTLIVEVOTE,(PVM pVM, PSSMHANDLE pSSM, uint32_t uPass));
    863863/** Pointer to a FNSSMINTLIVEVOTE() function. */
    864864typedef FNSSMINTLIVEVOTE *PFNSSMINTLIVEVOTE;
    … …  
    871871 * @param   pSSM            SSM operation handle.
    872872 */
    873 typedef DECLCALLBACK(int) FNSSMINTSAVEPREP(PVM pVM, PSSMHANDLE pSSM);
     873typedef DECLCALLBACKTYPE(int, FNSSMINTSAVEPREP,(PVM pVM, PSSMHANDLE pSSM));
    874874/** Pointer to a FNSSMINTSAVEPREP() function. */
    875875typedef FNSSMINTSAVEPREP *PFNSSMINTSAVEPREP;
    … …  
    882882 * @param   pSSM            SSM operation handle.
    883883 */
    884 typedef DECLCALLBACK(int) FNSSMINTSAVEEXEC(PVM pVM, PSSMHANDLE pSSM);
     884typedef DECLCALLBACKTYPE(int, FNSSMINTSAVEEXEC,(PVM pVM, PSSMHANDLE pSSM));
    885885/** Pointer to a FNSSMINTSAVEEXEC() function. */
    886886typedef FNSSMINTSAVEEXEC *PFNSSMINTSAVEEXEC;
    … …  
    893893 * @param   pSSM            SSM operation handle.
    894894 */
    895 typedef DECLCALLBACK(int) FNSSMINTSAVEDONE(PVM pVM, PSSMHANDLE pSSM);
     895typedef DECLCALLBACKTYPE(int, FNSSMINTSAVEDONE,(PVM pVM, PSSMHANDLE pSSM));
    896896/** Pointer to a FNSSMINTSAVEDONE() function. */
    897897typedef FNSSMINTSAVEDONE *PFNSSMINTSAVEDONE;
    … …  
    904904 * @param   pSSM            SSM operation handle.
    905905 */
    906 typedef DECLCALLBACK(int) FNSSMINTLOADPREP(PVM pVM, PSSMHANDLE pSSM);
     906typedef DECLCALLBACKTYPE(int, FNSSMINTLOADPREP,(PVM pVM, PSSMHANDLE pSSM));
    907907/** Pointer to a FNSSMINTLOADPREP() function. */
    908908typedef FNSSMINTLOADPREP *PFNSSMINTLOADPREP;
    … …  
    918918 *                          that doesn't specify a pfnSaveLive callback.
    919919 */
    920 typedef DECLCALLBACK(int) FNSSMINTLOADEXEC(PVM pVM, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass);
     920typedef DECLCALLBACKTYPE(int, FNSSMINTLOADEXEC,(PVM pVM, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass));
    921921/** Pointer to a FNSSMINTLOADEXEC() function. */
    922922typedef FNSSMINTLOADEXEC *PFNSSMINTLOADEXEC;
    … …  
    929929 * @param   pSSM            SSM operation handle.
    930930 */
    931 typedef DECLCALLBACK(int) FNSSMINTLOADDONE(PVM pVM, PSSMHANDLE pSSM);
     931typedef DECLCALLBACKTYPE(int, FNSSMINTLOADDONE,(PVM pVM, PSSMHANDLE pSSM));
    932932/** Pointer to a FNSSMINTLOADDONE() function. */
    933933typedef FNSSMINTLOADDONE *PFNSSMINTLOADDONE;
    … …  
    948948 * @thread  Any.
    949949 */
    950 typedef DECLCALLBACK(int) FNSSMEXTLIVEPREP(PSSMHANDLE pSSM, void *pvUser);
     950typedef DECLCALLBACKTYPE(int, FNSSMEXTLIVEPREP,(PSSMHANDLE pSSM, void *pvUser));
    951951/** Pointer to a FNSSMEXTLIVEPREP() function. */
    952952typedef FNSSMEXTLIVEPREP *PFNSSMEXTLIVEPREP;
    … …  
    964964 * @thread  Any.
    965965 */
    966 typedef DECLCALLBACK(int) FNSSMEXTLIVEEXEC(PSSMHANDLE pSSM, void *pvUser, uint32_t uPass);
     966typedef DECLCALLBACKTYPE(int, FNSSMEXTLIVEEXEC,(PSSMHANDLE pSSM, void *pvUser, uint32_t uPass));
    967967/** Pointer to a FNSSMEXTLIVEEXEC() function. */
    968968typedef FNSSMEXTLIVEEXEC *PFNSSMEXTLIVEEXEC;
    … …  
    986986 * @thread  Any.
    987987 */
    988 typedef DECLCALLBACK(int) FNSSMEXTLIVEVOTE(PSSMHANDLE pSSM, void *pvUser, uint32_t uPass);
     988typedef DECLCALLBACKTYPE(int, FNSSMEXTLIVEVOTE,(PSSMHANDLE pSSM, void *pvUser, uint32_t uPass));
    989989/** Pointer to a FNSSMEXTLIVEVOTE() function. */
    990990typedef FNSSMEXTLIVEVOTE *PFNSSMEXTLIVEVOTE;
    … …  
    997997 * @param   pvUser          User argument.
    998998 */
    999 typedef DECLCALLBACK(int) FNSSMEXTSAVEPREP(PSSMHANDLE pSSM, void *pvUser);
     999typedef DECLCALLBACKTYPE(int, FNSSMEXTSAVEPREP,(PSSMHANDLE pSSM, void *pvUser));
    10001000/** Pointer to a FNSSMEXTSAVEPREP() function. */
    10011001typedef FNSSMEXTSAVEPREP *PFNSSMEXTSAVEPREP;
    … …  
    10081008 * @author  The lack of return code is for legacy reasons.
    10091009 */
    1010 typedef DECLCALLBACK(void) FNSSMEXTSAVEEXEC(PSSMHANDLE pSSM, void *pvUser);
     1010typedef DECLCALLBACKTYPE(void, FNSSMEXTSAVEEXEC,(PSSMHANDLE pSSM, void *pvUser));
    10111011/** Pointer to a FNSSMEXTSAVEEXEC() function. */
    10121012typedef FNSSMEXTSAVEEXEC *PFNSSMEXTSAVEEXEC;
    … …  
    10191019 * @param   pvUser          User argument.
    10201020 */
    1021 typedef DECLCALLBACK(int) FNSSMEXTSAVEDONE(PSSMHANDLE pSSM, void *pvUser);
     1021typedef DECLCALLBACKTYPE(int, FNSSMEXTSAVEDONE,(PSSMHANDLE pSSM, void *pvUser));
    10221022/** Pointer to a FNSSMEXTSAVEDONE() function. */
    10231023typedef FNSSMEXTSAVEDONE *PFNSSMEXTSAVEDONE;
    … …  
    10301030 * @param   pvUser          User argument.
    10311031 */
    1032 typedef DECLCALLBACK(int) FNSSMEXTLOADPREP(PSSMHANDLE pSSM, void *pvUser);
     1032typedef DECLCALLBACKTYPE(int, FNSSMEXTLOADPREP,(PSSMHANDLE pSSM, void *pvUser));
    10331033/** Pointer to a FNSSMEXTLOADPREP() function. */
    10341034typedef FNSSMEXTLOADPREP *PFNSSMEXTLOADPREP;
    … …  
    10451045 * @remark  The odd return value is for legacy reasons.
    10461046 */
    1047 typedef DECLCALLBACK(int) FNSSMEXTLOADEXEC(PSSMHANDLE pSSM, void *pvUser, uint32_t uVersion, uint32_t uPass);
     1047typedef DECLCALLBACKTYPE(int, FNSSMEXTLOADEXEC,(PSSMHANDLE pSSM, void *pvUser, uint32_t uVersion, uint32_t uPass));
    10481048/** Pointer to a FNSSMEXTLOADEXEC() function. */
    10491049typedef FNSSMEXTLOADEXEC *PFNSSMEXTLOADEXEC;
    … …  
    10561056 * @param   pvUser          User argument.
    10571057 */
    1058 typedef DECLCALLBACK(int) FNSSMEXTLOADDONE(PSSMHANDLE pSSM, void *pvUser);
     1058typedef DECLCALLBACKTYPE(int, FNSSMEXTLOADDONE,(PSSMHANDLE pSSM, void *pvUser));
    10591059/** Pointer to a FNSSMEXTLOADDONE() function. */
    10601060typedef FNSSMEXTLOADDONE *PFNSSMEXTLOADDONE;
    … …  
    10841084     * @param   cbToWrite           The number of bytes to write.
    10851085     */
    1086     DECLCALLBACKMEMBER(int, pfnWrite)(void *pvUser, uint64_t offStream, const void *pvBuf, size_t cbToWrite);
     1086    DECLCALLBACKMEMBER(int, pfnWrite,(void *pvUser, uint64_t offStream, const void *pvBuf, size_t cbToWrite));
    10871087
    10881088    /**
    … …  
    10981098     *                              end of the stream is encountered.
    10991099     */
    1100     DECLCALLBACKMEMBER(int, pfnRead)(void *pvUser, uint64_t offStream, void *pvBuf, size_t cbToRead, size_t *pcbRead);
     1100    DECLCALLBACKMEMBER(int, pfnRead,(void *pvUser, uint64_t offStream, void *pvBuf, size_t cbToRead, size_t *pcbRead));
    11011101
    11021102    /**
    … …  
    11121112     * @param   poffActual          Where to store the new file position. Optional.
    11131113     */
    1114     DECLCALLBACKMEMBER(int, pfnSeek)(void *pvUser, int64_t offSeek, unsigned uMethod, uint64_t *poffActual);
     1114    DECLCALLBACKMEMBER(int, pfnSeek,(void *pvUser, int64_t offSeek, unsigned uMethod, uint64_t *poffActual));
    11151115
    11161116    /**
    … …  
    11201120     * @param   pvUser              The user argument.
    11211121     */
    1122     DECLCALLBACKMEMBER(uint64_t, pfnTell)(void *pvUser);
     1122    DECLCALLBACKMEMBER(uint64_t, pfnTell,(void *pvUser));
    11231123
    11241124    /**
    … …  
    11311131     * @param   pcb                 Where to return the size/length.
    11321132     */
    1133     DECLCALLBACKMEMBER(int, pfnSize)(void *pvUser, uint64_t *pcb);
     1133    DECLCALLBACKMEMBER(int, pfnSize,(void *pvUser, uint64_t *pcb));
    11341134
    11351135    /**
    … …  
    11411141     * @remarks The method is expected to do a LogRel on failure.
    11421142     */
    1143     DECLCALLBACKMEMBER(int, pfnIsOk)(void *pvUser);
     1143    DECLCALLBACKMEMBER(int, pfnIsOk,(void *pvUser));
    11441144
    11451145    /**
    … …  
    11501150     * @param   fCancelled          True if the operation was cancelled.
    11511151     */
    1152     DECLCALLBACKMEMBER(int, pfnClose)(void *pvUser, bool fCancelled);
     1152    DECLCALLBACKMEMBER(int, pfnClose,(void *pvUser, bool fCancelled));
    11531153
    11541154    /** Struct magic + version (SSMSTRMOPS_VERSION). */

  • trunk/include/VBox/vmm/stam.h

    r84119 r85121  
    11911191 * @param   pvSample    The sample registered using STAMR3RegisterCallback.
    11921192 */
    1193 typedef void FNSTAMR3CALLBACKRESET(PVM pVM, void *pvSample);
     1193typedef DECLCALLBACKTYPE(void, FNSTAMR3CALLBACKRESET,(PVM pVM, void *pvSample));
    11941194/** Pointer to a STAM sample reset callback. */
    11951195typedef FNSTAMR3CALLBACKRESET *PFNSTAMR3CALLBACKRESET;
    … …  
    12031203 * @param   cchBuf      The size of the buffer.
    12041204 */
    1205 typedef void FNSTAMR3CALLBACKPRINT(PVM pVM, void *pvSample, char *pszBuf, size_t cchBuf);
     1205typedef DECLCALLBACKTYPE(void, FNSTAMR3CALLBACKPRINT,(PVM pVM, void *pvSample, char *pszBuf, size_t cchBuf));
    12061206/** Pointer to a STAM sample print callback. */
    12071207typedef FNSTAMR3CALLBACKPRINT *PFNSTAMR3CALLBACKPRINT;
    … …  
    12471247 * @param   pvUser          The pvUser argument given to STAMR3Enum().
    12481248 */
    1249 typedef DECLCALLBACK(int) FNSTAMR3ENUM(const char *pszName, STAMTYPE enmType, void *pvSample, STAMUNIT enmUnit,
    1250                                        STAMVISIBILITY enmVisiblity, const char *pszDesc, void *pvUser);
     1249typedef DECLCALLBACKTYPE(int, FNSTAMR3ENUM,(const char *pszName, STAMTYPE enmType, void *pvSample, STAMUNIT enmUnit,
     1250                                            STAMVISIBILITY enmVisiblity, const char *pszDesc, void *pvUser));
    12511251/** Pointer to a FNSTAMR3ENUM(). */
    12521252typedef FNSTAMR3ENUM *PFNSTAMR3ENUM;

  • trunk/include/VBox/vmm/tm.h

    r82968 r85121  
    165165 * @param   pvUser          User argument specified upon timer creation.
    166166 */
    167 typedef DECLCALLBACK(void) FNTMTIMERDEV(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser);
     167typedef DECLCALLBACKTYPE(void, FNTMTIMERDEV,(PPDMDEVINS pDevIns, PTMTIMER pTimer, void *pvUser));
    168168/** Pointer to a device timer callback function. */
    169169typedef FNTMTIMERDEV *PFNTMTIMERDEV;
    … …  
    177177 * @param   pvUser          User argument specified upon timer creation.
    178178 */
    179 typedef DECLCALLBACK(void) FNTMTIMERUSB(PPDMUSBINS pUsbIns, PTMTIMER pTimer, void *pvUser);
     179typedef DECLCALLBACKTYPE(void, FNTMTIMERUSB,(PPDMUSBINS pUsbIns, PTMTIMER pTimer, void *pvUser));
    180180/** Pointer to a timer callback for a USB device. */
    181181typedef FNTMTIMERUSB *PFNTMTIMERUSB;
    … …  
    188188 * @param   pvUser          User argument specified upon timer creation.
    189189 */
    190 typedef DECLCALLBACK(void) FNTMTIMERDRV(PPDMDRVINS pDrvIns, PTMTIMER pTimer, void *pvUser);
     190typedef DECLCALLBACKTYPE(void, FNTMTIMERDRV,(PPDMDRVINS pDrvIns, PTMTIMER pTimer, void *pvUser));
    191191/** Pointer to a driver timer callback function. */
    192192typedef FNTMTIMERDRV *PFNTMTIMERDRV;
    … …  
    198198 * @param   pTimer          The timer handle.
    199199 */
    200 typedef DECLCALLBACK(void) FNTMTIMERSRV(PPDMSRVINS pSrvIns, PTMTIMER pTimer);
     200typedef DECLCALLBACKTYPE(void, FNTMTIMERSRV,(PPDMSRVINS pSrvIns, PTMTIMER pTimer));
    201201/** Pointer to a service timer callback function. */
    202202typedef FNTMTIMERSRV *PFNTMTIMERSRV;
    … …  
    209209 * @param   pvUser          User argument specified upon timer creation.
    210210 */
    211 typedef DECLCALLBACK(void) FNTMTIMERINT(PVM pVM, PTMTIMER pTimer, void *pvUser);
     211typedef DECLCALLBACKTYPE(void, FNTMTIMERINT,(PVM pVM, PTMTIMER pTimer, void *pvUser));
    212212/** Pointer to internal timer callback function. */
    213213typedef FNTMTIMERINT *PFNTMTIMERINT;
    … …  
    218218 * @param   pvUser          User argument as specified when the timer was created.
    219219 */
    220 typedef DECLCALLBACK(void) FNTMTIMEREXT(void *pvUser);
     220typedef DECLCALLBACKTYPE(void, FNTMTIMEREXT,(void *pvUser));
    221221/** Pointer to an external timer callback function. */
    222222typedef FNTMTIMEREXT *PFNTMTIMEREXT;

  • trunk/include/VBox/vmm/vmapi.h

    r82968 r85121  
    6868 * @param   args            Error message arguments.
    6969 */
    70 typedef DECLCALLBACK(void) FNVMATERROR(PUVM pUVM, void *pvUser, int rc, RT_SRC_POS_DECL, const char *pszError, va_list args);
     70typedef DECLCALLBACKTYPE(void, FNVMATERROR,(PUVM pUVM, void *pvUser, int rc, RT_SRC_POS_DECL, const char *pszError, va_list args));
    7171/** Pointer to a VM error callback. */
    7272typedef FNVMATERROR *PFNVMATERROR;
    … …  
    118118 * @param   va              Error message arguments.
    119119 */
    120 typedef DECLCALLBACK(void) FNVMATRUNTIMEERROR(PUVM pUVM, void *pvUser, uint32_t fFlags, const char *pszErrorId,
    121                                               const char *pszFormat, va_list va) RT_IPRT_FORMAT_ATTR(5, 0);
     120typedef DECLCALLBACKTYPE(void, FNVMATRUNTIMEERROR,(PUVM pUVM, void *pvUser, uint32_t fFlags, const char *pszErrorId,
     121                                                   const char *pszFormat, va_list va)) RT_IPRT_FORMAT_ATTR(5, 0);
    122122/** Pointer to a VM runtime error callback. */
    123123typedef FNVMATRUNTIMEERROR *PFNVMATRUNTIMEERROR;
    … …  
    158158 * @param   pvUser      The user argument.
    159159 */
    160 typedef DECLCALLBACK(void) FNVMATSTATE(PUVM pUVM, VMSTATE enmState, VMSTATE enmOldState, void *pvUser);
     160typedef DECLCALLBACKTYPE(void, FNVMATSTATE,(PUVM pUVM, VMSTATE enmState, VMSTATE enmOldState, void *pvUser));
    161161/** Pointer to a VM state callback. */
    162162typedef FNVMATSTATE *PFNVMATSTATE;
    … …  
    363363 * @param   pvUser      User specified argument.
    364364 */
    365 typedef DECLCALLBACK(int) FNVMPROGRESS(PUVM pUVM, unsigned uPercent, void *pvUser);
     365typedef DECLCALLBACKTYPE(int, FNVMPROGRESS,(PUVM pUVM, unsigned uPercent, void *pvUser));
    366366/** Pointer to a FNVMPROGRESS function. */
    367367typedef FNVMPROGRESS *PFNVMPROGRESS;

  • trunk/include/VBox/vmm/vmm.h

    r84458 r85121  
    9898 * @param   pvUser          The user argument.
    9999 */
    100 typedef DECLCALLBACK(int) FNVMMR0CALLRING3NOTIFICATION(PVMCPUCC pVCpu, VMMCALLRING3 enmOperation, void *pvUser);
     100typedef DECLCALLBACKTYPE(int, FNVMMR0CALLRING3NOTIFICATION,(PVMCPUCC pVCpu, VMMCALLRING3 enmOperation, void *pvUser));
    101101/** Pointer to a FNRTMPNOTIFICATION(). */
    102102typedef FNVMMR0CALLRING3NOTIFICATION *PFNVMMR0CALLRING3NOTIFICATION;
    … …  
    113113 * @param   pvUser  The user argument.
    114114 */
    115 typedef DECLCALLBACK(VBOXSTRICTRC) FNVMMEMTRENDEZVOUS(PVM pVM, PVMCPU pVCpu, void *pvUser);
     115typedef DECLCALLBACKTYPE(VBOXSTRICTRC, FNVMMEMTRENDEZVOUS,(PVM pVM, PVMCPU pVCpu, void *pvUser));
    116116/** Pointer to a rendezvous callback function. */
    117117typedef FNVMMEMTRENDEZVOUS *PFNVMMEMTRENDEZVOUS;

  • trunk/include/VBox/vrdpusb.h

    r82968 r85121  
    6969    PREMOTEUSBBACKEND pInstance;
    7070
    71     DECLCALLBACKMEMBER(int, pfnOpen)             (PREMOTEUSBBACKEND pInstance, const char *pszAddress, size_t cbAddress, PREMOTEUSBDEVICE *ppDevice);
    72     DECLCALLBACKMEMBER(void, pfnClose)           (PREMOTEUSBDEVICE pDevice);
    73     DECLCALLBACKMEMBER(int, pfnReset)            (PREMOTEUSBDEVICE pDevice);
    74     DECLCALLBACKMEMBER(int, pfnSetConfig)        (PREMOTEUSBDEVICE pDevice, uint8_t u8Cfg);
    75     DECLCALLBACKMEMBER(int, pfnClaimInterface)   (PREMOTEUSBDEVICE pDevice, uint8_t u8Ifnum);
    76     DECLCALLBACKMEMBER(int, pfnReleaseInterface) (PREMOTEUSBDEVICE pDevice, uint8_t u8Ifnum);
    77     DECLCALLBACKMEMBER(int, pfnInterfaceSetting) (PREMOTEUSBDEVICE pDevice, uint8_t u8Ifnum, uint8_t u8Setting);
    78     DECLCALLBACKMEMBER(int, pfnQueueURB)         (PREMOTEUSBDEVICE pDevice, uint8_t u8Type, uint8_t u8Ep, uint8_t u8Direction, uint32_t u32Len, void *pvData, void *pvURB, PREMOTEUSBQURB *ppRemoteURB);
    79     DECLCALLBACKMEMBER(int, pfnReapURB)          (PREMOTEUSBDEVICE pDevice, uint32_t u32Millies, void **ppvURB, uint32_t *pu32Len, uint32_t *pu32Err);
    80     DECLCALLBACKMEMBER(int, pfnClearHaltedEP)    (PREMOTEUSBDEVICE pDevice, uint8_t u8Ep);
    81     DECLCALLBACKMEMBER(void, pfnCancelURB)       (PREMOTEUSBDEVICE pDevice, PREMOTEUSBQURB pRemoteURB);
    82     DECLCALLBACKMEMBER(int, pfnWakeup)           (PREMOTEUSBDEVICE pDevice);
     71    DECLCALLBACKMEMBER(int, pfnOpen,(PREMOTEUSBBACKEND pInstance, const char *pszAddress, size_t cbAddress, PREMOTEUSBDEVICE *ppDevice));
     72    DECLCALLBACKMEMBER(void, pfnClose,(PREMOTEUSBDEVICE pDevice));
     73    DECLCALLBACKMEMBER(int, pfnReset,(PREMOTEUSBDEVICE pDevice));
     74    DECLCALLBACKMEMBER(int, pfnSetConfig,(PREMOTEUSBDEVICE pDevice, uint8_t u8Cfg));
     75    DECLCALLBACKMEMBER(int, pfnClaimInterface,(PREMOTEUSBDEVICE pDevice, uint8_t u8Ifnum));
     76    DECLCALLBACKMEMBER(int, pfnReleaseInterface,(PREMOTEUSBDEVICE pDevice, uint8_t u8Ifnum));
     77    DECLCALLBACKMEMBER(int, pfnInterfaceSetting,(PREMOTEUSBDEVICE pDevice, uint8_t u8Ifnum, uint8_t u8Setting));
     78    DECLCALLBACKMEMBER(int, pfnQueueURB,(PREMOTEUSBDEVICE pDevice, uint8_t u8Type, uint8_t u8Ep, uint8_t u8Direction, uint32_t u32Len, void *pvData, void *pvURB, PREMOTEUSBQURB *ppRemoteURB));
     79    DECLCALLBACKMEMBER(int, pfnReapURB,(PREMOTEUSBDEVICE pDevice, uint32_t u32Millies, void **ppvURB, uint32_t *pu32Len, uint32_t *pu32Err));
     80    DECLCALLBACKMEMBER(int, pfnClearHaltedEP,(PREMOTEUSBDEVICE pDevice, uint8_t u8Ep));
     81    DECLCALLBACKMEMBER(void, pfnCancelURB,(PREMOTEUSBDEVICE pDevice, PREMOTEUSBQURB pRemoteURB));
     82    DECLCALLBACKMEMBER(int, pfnWakeup,(PREMOTEUSBDEVICE pDevice));
    8383} REMOTEUSBCALLBACK;
    8484

  • trunk/include/VBox/vscsi.h

    r82968 r85121  
    290290 * The virtual SCSI request completed callback.
    291291 */
    292 typedef DECLCALLBACK(void) FNVSCSIREQCOMPLETED(VSCSIDEVICE hVScsiDevice,
    293                                                void *pvVScsiDeviceUser,
    294                                                void *pvVScsiReqUser,
    295                                                int rcScsiCode,
    296                                                bool fRedoPossible,
    297                                                int rcReq,
    298                                                size_t cbXfer,
    299                                                VSCSIXFERDIR enmXferDir,
    300                                                size_t cbSense);
     292typedef DECLCALLBACKTYPE(void, FNVSCSIREQCOMPLETED,(VSCSIDEVICE hVScsiDevice,
     293                                                    void *pvVScsiDeviceUser,
     294                                                    void *pvVScsiReqUser,
     295                                                    int rcScsiCode,
     296                                                    bool fRedoPossible,
     297                                                    int rcReq,
     298                                                    size_t cbXfer,
     299                                                    VSCSIXFERDIR enmXferDir,
     300                                                    size_t cbSense));
    301301/** Pointer to a virtual SCSI request completed callback. */
    302302typedef FNVSCSIREQCOMPLETED *PFNVSCSIREQCOMPLETED;

  • trunk/include/VBox/vusb.h

    r82968 r85121  
    937937 * @thread  The reset thread or EMT.
    938938 */
    939 typedef DECLCALLBACK(void) FNVUSBRESETDONE(PVUSBIDEVICE pDevice, int rc, void *pvUser);
     939typedef DECLCALLBACKTYPE(void, FNVUSBRESETDONE,(PVUSBIDEVICE pDevice, int rc, void *pvUser));
    940940/** Pointer to a device reset completion callback function (FNUSBRESETDONE). */
    941941typedef FNVUSBRESETDONE *PFNVUSBRESETDONE;

  • trunk/include/iprt/asn1.h

    r84310 r85121  
    6969     * @param   pv              Pointer to the memory that shall be freed. Not NULL.
    7070     */
    71     DECLCALLBACKMEMBER(void, pfnFree)(struct RTASN1ALLOCATORVTABLE const *pThis, PRTASN1ALLOCATION pAllocation,
    72                                       void *pv);
     71    DECLCALLBACKMEMBER(void, pfnFree,(struct RTASN1ALLOCATORVTABLE const *pThis, PRTASN1ALLOCATION pAllocation,
     72                                      void *pv));
    7373    /**
    7474     * Allocates a chunk of memory, all initialized to zero.
    … …  
    8282     *                          pInfo->cbAllocated on success.
    8383     */
    84     DECLCALLBACKMEMBER(int, pfnAlloc)(struct RTASN1ALLOCATORVTABLE const *pThis, PRTASN1ALLOCATION pAllocation,
    85                                       void **ppv, size_t cb);
     84    DECLCALLBACKMEMBER(int, pfnAlloc,(struct RTASN1ALLOCATORVTABLE const *pThis, PRTASN1ALLOCATION pAllocation,
     85                                      void **ppv, size_t cb));
    8686    /**
    8787     * Reallocates a memory allocation.
    … …  
    104104     *                          pInfo->cbAllocated on success.
    105105     */
    106     DECLCALLBACKMEMBER(int, pfnRealloc)(struct RTASN1ALLOCATORVTABLE const *pThis, PRTASN1ALLOCATION pAllocation,
    107                                         void *pvOld, void **ppvNew, size_t cbNew);
     106    DECLCALLBACKMEMBER(int, pfnRealloc,(struct RTASN1ALLOCATORVTABLE const *pThis, PRTASN1ALLOCATION pAllocation,
     107                                        void *pvOld, void **ppvNew, size_t cbNew));
    108108
    109109    /**
    … …  
    115115     * @param   papvArray       Pointer to the pointer array to be freed.  Not NULL.
    116116     */
    117     DECLCALLBACKMEMBER(void, pfnFreeArray)(struct RTASN1ALLOCATORVTABLE const *pThis, PRTASN1ARRAYALLOCATION pAllocation,
    118                                            void **papvArray);
     117    DECLCALLBACKMEMBER(void, pfnFreeArray,(struct RTASN1ALLOCATORVTABLE const *pThis, PRTASN1ARRAYALLOCATION pAllocation,
     118                                           void **papvArray));
    119119    /**
    120120     * Grows the array to at least @a cMinEntries.
    … …  
    131131     *                          on successful return.
    132132     */
    133     DECLCALLBACKMEMBER(int, pfnGrowArray)(struct RTASN1ALLOCATORVTABLE const *pThis, PRTASN1ARRAYALLOCATION pAllocation,
    134                                           void ***ppapvArray, uint32_t cMinEntries);
     133    DECLCALLBACKMEMBER(int, pfnGrowArray,(struct RTASN1ALLOCATORVTABLE const *pThis, PRTASN1ARRAYALLOCATION pAllocation,
     134                                          void ***ppapvArray, uint32_t cMinEntries));
    135135    /**
    136136     * Shrinks the array (depends on allocator policy).
    … …  
    147147     * @param   cCurrent        The new entry count.
    148148     */
    149     DECLCALLBACKMEMBER(void, pfnShrinkArray)(struct RTASN1ALLOCATORVTABLE const *pThis, PRTASN1ARRAYALLOCATION pAllocation,
    150                                              void ***ppapvArray, uint32_t cNew, uint32_t cCurrent);
     149    DECLCALLBACKMEMBER(void, pfnShrinkArray,(struct RTASN1ALLOCATORVTABLE const *pThis, PRTASN1ARRAYALLOCATION pAllocation,
     150                                             void ***ppapvArray, uint32_t cNew, uint32_t cCurrent));
    151151} RTASN1ALLOCATORVTABLE;
    152152/** Pointer to an ASN.1 allocator vtable. */
    … …  
    307307 * @param   pvUser              Callback user parameter.
    308308 */
    309 typedef DECLCALLBACK(int) FNRTASN1ENUMCALLBACK(struct RTASN1CORE *pAsn1Core, const char *pszName, uint32_t uDepth, void *pvUser);
     309typedef DECLCALLBACKTYPE(int, FNRTASN1ENUMCALLBACK,(struct RTASN1CORE *pAsn1Core, const char *pszName, uint32_t uDepth,
     310                                                    void *pvUser));
    310311/** Pointer to an ASN.1 object enumeration callback. */
    311312typedef FNRTASN1ENUMCALLBACK *PFNRTASN1ENUMCALLBACK;
    … …  
    320321 * @param   pErrInfo            Where to store extended error info. Optional.
    321322 */
    322 typedef DECLCALLBACK(int) FNRTASN1ENCODEWRITER(const void *pvBuf, size_t cbToWrite, void *pvUser, PRTERRINFO pErrInfo);
     323typedef DECLCALLBACKTYPE(int, FNRTASN1ENCODEWRITER,(const void *pvBuf, size_t cbToWrite, void *pvUser, PRTERRINFO pErrInfo));
    323324/** Pointer to an ASN.1 encoding writer callback. */
    324325typedef FNRTASN1ENCODEWRITER *PFNRTASN1ENCODEWRITER;
    … …  
    337338 * @param   pThisCore       Pointer to the ASN.1 core to destroy.
    338339 */
    339 typedef DECLCALLBACK(void) FNRTASN1COREVTDTOR(PRTASN1CORE pThisCore);
     340typedef DECLCALLBACKTYPE(void, FNRTASN1COREVTDTOR,(PRTASN1CORE pThisCore));
    340341/** Pointer to a FNRTASN1COREVTDTOR method. */
    341342typedef FNRTASN1COREVTDTOR *PFNRTASN1COREVTDTOR;
    … …  
    350351 * @param   pvUser          Callback user argument.
    351352 */
    352 typedef DECLCALLBACK(int) FNRTASN1COREVTENUM(PRTASN1CORE pThisCore, PFNRTASN1ENUMCALLBACK pfnCallback,
    353                                              uint32_t uDepth, void *pvUser);
     353typedef DECLCALLBACKTYPE(int, FNRTASN1COREVTENUM,(PRTASN1CORE pThisCore, PFNRTASN1ENUMCALLBACK pfnCallback,
     354                                                  uint32_t uDepth, void *pvUser));
    354355/** Pointer to a FNRTASN1COREVTENUM method. */
    355356typedef FNRTASN1COREVTENUM *PFNRTASN1COREVTENUM;
    … …  
    364365 * @param   pAllocator      The allocator to use.
    365366 */
    366 typedef DECLCALLBACK(int) FNRTASN1COREVTCLONE(PRTASN1CORE pThisCore, PCRTASN1CORE pSrcCore, PCRTASN1ALLOCATORVTABLE pAllocator);
     367typedef DECLCALLBACKTYPE(int, FNRTASN1COREVTCLONE,(PRTASN1CORE pThisCore, PCRTASN1CORE pSrcCore,
     368                                                   PCRTASN1ALLOCATORVTABLE pAllocator));
    367369/** Pointer to a FNRTASN1COREVTCLONE method. */
    368370typedef FNRTASN1COREVTCLONE *PFNRTASN1COREVTCLONE;
    … …  
    377379 * @param   pRightCore      Pointer to the ASN.1 core of the right side object.
    378380 */
    379 typedef DECLCALLBACK(int) FNRTASN1COREVTCOMPARE(PCRTASN1CORE pLeftCore, PCRTASN1CORE pRightCore);
     381typedef DECLCALLBACKTYPE(int, FNRTASN1COREVTCOMPARE,(PCRTASN1CORE pLeftCore, PCRTASN1CORE pRightCore));
    380382/** Pointer to a FNRTASN1COREVTCOMPARE method. */
    381383typedef FNRTASN1COREVTCOMPARE *PFNRTASN1COREVTCOMPARE;
    … …  
    390392 * @param   pszErrorTag     Tag for the additional error details.
    391393 */
    392 typedef DECLCALLBACK(int) FNRTASN1COREVTCHECKSANITY(PCRTASN1CORE pThisCore, uint32_t fFlags,
    393                                                     PRTERRINFO pErrInfo, const char *pszErrorTag);
     394typedef DECLCALLBACKTYPE(int, FNRTASN1COREVTCHECKSANITY,(PCRTASN1CORE pThisCore, uint32_t fFlags,
     395                                                         PRTERRINFO pErrInfo, const char *pszErrorTag));
    394396/** Pointer to a FNRTASN1COREVTCHECKSANITY method. */
    395397typedef FNRTASN1COREVTCHECKSANITY *PFNRTASN1COREVTCHECKSANITY;
    … …  
    407409 * @param   pErrInfo        Where to return extra error information. Optional.
    408410 */
    409 typedef DECLCALLBACK(int) FNRTASN1COREVTENCODEPREP(PRTASN1CORE pThisCore, uint32_t fFlags, PRTERRINFO pErrInfo);
     411typedef DECLCALLBACKTYPE(int, FNRTASN1COREVTENCODEPREP,(PRTASN1CORE pThisCore, uint32_t fFlags, PRTERRINFO pErrInfo));
    410412/** Pointer to a FNRTASN1COREVTENCODEWRITE method. */
    411413typedef FNRTASN1COREVTENCODEPREP *PFNRTASN1COREVTENCODEPREP;
    … …  
    424426 * @param   pErrInfo        Where to return extra error information. Optional.
    425427 */
    426 typedef DECLCALLBACK(int) FNRTASN1COREVTENCODEWRITE(PRTASN1CORE pThisCore, uint32_t fFlags, PFNRTASN1ENCODEWRITER pfnWriter,
    427                                                     void *pvUser, PRTERRINFO pErrInfo);
     428typedef DECLCALLBACKTYPE(int, FNRTASN1COREVTENCODEWRITE,(PRTASN1CORE pThisCore, uint32_t fFlags, PFNRTASN1ENCODEWRITER pfnWriter,
     429                                                         void *pvUser, PRTERRINFO pErrInfo));
    428430/** Pointer to a FNRTASN1COREVTENCODEWRITE method. */
    429431typedef FNRTASN1COREVTENCODEWRITE *PFNRTASN1COREVTENCODEWRITE;

  • trunk/include/iprt/avl.h

    r82968 r85121  
    6868/** Callback function for AVLPVDoWithAll().
    6969 *  @returns IPRT status codes. */
    70 typedef DECLCALLBACK(int) AVLPVCALLBACK(PAVLPVNODECORE, void *);
     70typedef DECLCALLBACKTYPE(int, AVLPVCALLBACK,(PAVLPVNODECORE, void *));
    7171/** Pointer to callback function for AVLPVDoWithAll(). */
    7272typedef AVLPVCALLBACK *PAVLPVCALLBACK;
    … …  
    109109/** Callback function for AVLULDoWithAll().
    110110 *  @returns IPRT status codes. */
    111 typedef DECLCALLBACK(int) AVLULCALLBACK(PAVLULNODECORE, void*);
     111typedef DECLCALLBACKTYPE(int, AVLULCALLBACK,(PAVLULNODECORE, void*));
    112112/** Pointer to callback function for AVLULDoWithAll(). */
    113113typedef AVLULCALLBACK *PAVLULCALLBACK;
    … …  
    157157/** Callback function for AVLPVDoWithAll().
    158158 *  @returns IPRT status codes. */
    159 typedef DECLCALLBACK(int) AVLRPVCALLBACK(PAVLRPVNODECORE, void *);
     159typedef DECLCALLBACKTYPE(int, AVLRPVCALLBACK,(PAVLRPVNODECORE, void *));
    160160/** Pointer to callback function for AVLPVDoWithAll(). */
    161161typedef AVLRPVCALLBACK *PAVLRPVCALLBACK;
    … …  
    201201/** Callback function for AVLU32DoWithAll() & AVLU32Destroy().
    202202 *  @returns IPRT status codes. */
    203 typedef DECLCALLBACK(int) AVLU32CALLBACK(PAVLU32NODECORE, void*);
     203typedef DECLCALLBACKTYPE(int, AVLU32CALLBACK,(PAVLU32NODECORE, void*));
    204204/** Pointer to callback function for AVLU32DoWithAll() & AVLU32Destroy(). */
    205205typedef AVLU32CALLBACK *PAVLU32CALLBACK;
    … …  
    256256/** Callback function for RTAvloU32DoWithAll().
    257257 *  @returns IPRT status codes. */
    258 typedef DECLCALLBACK(int)   AVLOU32CALLBACK(PAVLOU32NODECORE pNode, void *pvUser);
     258typedef DECLCALLBACKTYPE(int, AVLOU32CALLBACK,(PAVLOU32NODECORE pNode, void *pvUser));
    259259/** Pointer to callback function for RTAvloU32DoWithAll(). */
    260260typedef AVLOU32CALLBACK *PAVLOU32CALLBACK;
    … …  
    290290/** Callback function for RTAvllU32DoWithAll() & RTAvllU32Destroy().
    291291 *  @returns IPRT status codes. */
    292 typedef DECLCALLBACK(int) AVLLU32CALLBACK(PAVLLU32NODECORE, void*);
     292typedef DECLCALLBACKTYPE(int, AVLLU32CALLBACK,(PAVLLU32NODECORE, void*));
    293293/** Pointer to callback function for RTAvllU32DoWithAll() & RTAvllU32Destroy(). */
    294294typedef AVLLU32CALLBACK *PAVLLU32CALLBACK;
    … …  
    333333/** Callback function for AVLU64DoWithAll() & AVLU64Destroy().
    334334 *  @returns IPRT status codes. */
    335 typedef DECLCALLBACK(int) AVLU64CALLBACK(PAVLU64NODECORE, void*);
     335typedef DECLCALLBACKTYPE(int, AVLU64CALLBACK,(PAVLU64NODECORE, void*));
    336336/** Pointer to callback function for AVLU64DoWithAll() & AVLU64Destroy(). */
    337337typedef AVLU64CALLBACK *PAVLU64CALLBACK;
    … …  
    380380/** Callback function for AVLRU64DoWithAll().
    381381 *  @returns IPRT status codes. */
    382 typedef DECLCALLBACK(int) AVLRU64CALLBACK(PAVLRU64NODECORE, void *);
     382typedef DECLCALLBACKTYPE(int, AVLRU64CALLBACK,(PAVLRU64NODECORE, void *));
    383383/** Pointer to callback function for AVLU64DoWithAll(). */
    384384typedef AVLRU64CALLBACK *PAVLRU64CALLBACK;
    … …  
    438438/** Callback function for RTAvloGCPhysDoWithAll() and RTAvloGCPhysDestroy().
    439439 *  @returns IPRT status codes. */
    440 typedef DECLCALLBACK(int)   AVLOGCPHYSCALLBACK(PAVLOGCPHYSNODECORE pNode, void *pvUser);
     440typedef DECLCALLBACKTYPE(int, AVLOGCPHYSCALLBACK,(PAVLOGCPHYSNODECORE pNode, void *pvUser));
    441441/** Pointer to callback function for RTAvloGCPhysDoWithAll() and RTAvloGCPhysDestroy(). */
    442442typedef AVLOGCPHYSCALLBACK *PAVLOGCPHYSCALLBACK;
    … …  
    492492/** Callback function for RTAvlroGCPhysDoWithAll() and RTAvlroGCPhysDestroy().
    493493 *  @returns IPRT status codes. */
    494 typedef DECLCALLBACK(int)   AVLROGCPHYSCALLBACK(PAVLROGCPHYSNODECORE pNode, void *pvUser);
     494typedef DECLCALLBACKTYPE(int, AVLROGCPHYSCALLBACK,(PAVLROGCPHYSNODECORE pNode, void *pvUser));
    495495/** Pointer to callback function for RTAvlroGCPhysDoWithAll() and RTAvlroGCPhysDestroy(). */
    496496typedef AVLROGCPHYSCALLBACK *PAVLROGCPHYSCALLBACK;
    … …  
    537537/** Callback function for RTAvlGCPtrDoWithAll().
    538538 *  @returns IPRT status codes. */
    539 typedef DECLCALLBACK(int)   AVLGCPTRCALLBACK(PAVLGCPTRNODECORE pNode, void *pvUser);
     539typedef DECLCALLBACKTYPE(int, AVLGCPTRCALLBACK,(PAVLGCPTRNODECORE pNode, void *pvUser));
    540540/** Pointer to callback function for RTAvlGCPtrDoWithAll(). */
    541541typedef AVLGCPTRCALLBACK *PAVLGCPTRCALLBACK;
    … …  
    588588/** Callback function for RTAvloGCPtrDoWithAll().
    589589 *  @returns IPRT status codes. */
    590 typedef DECLCALLBACK(int)   AVLOGCPTRCALLBACK(PAVLOGCPTRNODECORE pNode, void *pvUser);
     590typedef DECLCALLBACKTYPE(int, AVLOGCPTRCALLBACK,(PAVLOGCPTRNODECORE pNode, void *pvUser));
    591591/** Pointer to callback function for RTAvloGCPtrDoWithAll(). */
    592592typedef AVLOGCPTRCALLBACK *PAVLOGCPTRCALLBACK;
    … …  
    635635/** Callback function for RTAvlrGCPtrDoWithAll() and RTAvlrGCPtrDestroy().
    636636 *  @returns IPRT status codes. */
    637 typedef DECLCALLBACK(int)   AVLRGCPTRCALLBACK(PAVLRGCPTRNODECORE pNode, void *pvUser);
     637typedef DECLCALLBACKTYPE(int, AVLRGCPTRCALLBACK,(PAVLRGCPTRNODECORE pNode, void *pvUser));
    638638/** Pointer to callback function for RTAvlrGCPtrDoWithAll() and RTAvlrGCPtrDestroy(). */
    639639typedef AVLRGCPTRCALLBACK *PAVLRGCPTRCALLBACK;
    … …  
    692692/** Callback function for RTAvlroGCPtrDoWithAll() and RTAvlroGCPtrDestroy().
    693693 *  @returns IPRT status codes. */
    694 typedef DECLCALLBACK(int)   AVLROGCPTRCALLBACK(PAVLROGCPTRNODECORE pNode, void *pvUser);
     694typedef DECLCALLBACKTYPE(int, AVLROGCPTRCALLBACK,(PAVLROGCPTRNODECORE pNode, void *pvUser));
    695695/** Pointer to callback function for RTAvlroGCPtrDoWithAll() and RTAvlroGCPtrDestroy(). */
    696696typedef AVLROGCPTRCALLBACK *PAVLROGCPTRCALLBACK;
    … …  
    751751/** Callback function for RTAvlrooGCPtrDoWithAll() and RTAvlrooGCPtrDestroy().
    752752 *  @returns IPRT status codes. */
    753 typedef DECLCALLBACK(int)   AVLROOGCPTRCALLBACK(PAVLROOGCPTRNODECORE pNode, void *pvUser);
     753typedef DECLCALLBACKTYPE(int, AVLROOGCPTRCALLBACK,(PAVLROOGCPTRNODECORE pNode, void *pvUser));
    754754/** Pointer to callback function for RTAvlrooGCPtrDoWithAll() and RTAvlrooGCPtrDestroy(). */
    755755typedef AVLROOGCPTRCALLBACK *PAVLROOGCPTRCALLBACK;
    … …  
    803803/** Callback function for RTAvlUIntPtrDoWithAll() and RTAvlUIntPtrDestroy().
    804804 *  @returns IPRT status codes. */
    805 typedef DECLCALLBACK(int)    AVLUINTPTRCALLBACK(PAVLUINTPTRNODECORE pNode, void *pvUser);
     805typedef DECLCALLBACKTYPE(int, AVLUINTPTRCALLBACK,(PAVLUINTPTRNODECORE pNode, void *pvUser));
    806806/** Pointer to callback function for RTAvlUIntPtrDoWithAll() and RTAvlUIntPtrDestroy(). */
    807807typedef AVLUINTPTRCALLBACK *PAVLUINTPTRCALLBACK;
    … …  
    854854/** Callback function for RTAvlrUIntPtrDoWithAll() and RTAvlrUIntPtrDestroy().
    855855 *  @returns IPRT status codes. */
    856 typedef DECLCALLBACK(int)    AVLRUINTPTRCALLBACK(PAVLRUINTPTRNODECORE pNode, void *pvUser);
     856typedef DECLCALLBACKTYPE(int, AVLRUINTPTRCALLBACK,(PAVLRUINTPTRNODECORE pNode, void *pvUser));
    857857/** Pointer to callback function for RTAvlrUIntPtrDoWithAll() and RTAvlrUIntPtrDestroy(). */
    858858typedef AVLRUINTPTRCALLBACK *PAVLRUINTPTRCALLBACK;
    … …  
    911911/** Callback function for RTAvloHCPhysDoWithAll() and RTAvloHCPhysDestroy().
    912912 *  @returns IPRT status codes. */
    913 typedef DECLCALLBACK(int)   AVLOHCPHYSCALLBACK(PAVLOHCPHYSNODECORE pNode, void *pvUser);
     913typedef DECLCALLBACKTYPE(int, AVLOHCPHYSCALLBACK,(PAVLOHCPHYSNODECORE pNode, void *pvUser));
    914914/** Pointer to callback function for RTAvloHCPhysDoWithAll() and RTAvloHCPhysDestroy(). */
    915915typedef AVLOHCPHYSCALLBACK *PAVLOHCPHYSCALLBACK;
    … …  
    962962/** Callback function for RTAvloIOPortDoWithAll() and RTAvloIOPortDestroy().
    963963 *  @returns IPRT status codes. */
    964 typedef DECLCALLBACK(int)   AVLOIOPORTCALLBACK(PAVLOIOPORTNODECORE pNode, void *pvUser);
     964typedef DECLCALLBACKTYPE(int, AVLOIOPORTCALLBACK,(PAVLOIOPORTNODECORE pNode, void *pvUser));
    965965/** Pointer to callback function for RTAvloIOPortDoWithAll() and RTAvloIOPortDestroy(). */
    966966typedef AVLOIOPORTCALLBACK *PAVLOIOPORTCALLBACK;
    … …  
    10141014/** Callback function for RTAvlroIOPortDoWithAll() and RTAvlroIOPortDestroy().
    10151015 *  @returns IPRT status codes. */
    1016 typedef DECLCALLBACK(int)   AVLROIOPORTCALLBACK(PAVLROIOPORTNODECORE pNode, void *pvUser);
     1016typedef DECLCALLBACKTYPE(int, AVLROIOPORTCALLBACK,(PAVLROIOPORTNODECORE pNode, void *pvUser));
    10171017/** Pointer to callback function for RTAvlroIOPortDoWithAll() and RTAvlroIOPortDestroy(). */
    10181018typedef AVLROIOPORTCALLBACK *PAVLROIOPORTCALLBACK;
    … …  
    10641064/** Callback function for RTAvlHCPhysDoWithAll() and RTAvlHCPhysDestroy().
    10651065 *  @returns IPRT status codes. */
    1066 typedef DECLCALLBACK(int)   AVLHCPHYSCALLBACK(PAVLHCPHYSNODECORE pNode, void *pvUser);
     1066typedef DECLCALLBACKTYPE(int, AVLHCPHYSCALLBACK,(PAVLHCPHYSNODECORE pNode, void *pvUser));
    10671067/** Pointer to callback function for RTAvlHCPhysDoWithAll() and RTAvlHCPhysDestroy(). */
    10681068typedef AVLHCPHYSCALLBACK *PAVLHCPHYSCALLBACK;
    … …  
    11131113/** Callback function for RTAvlGCPhysDoWithAll() and RTAvlGCPhysDestroy().
    11141114 *  @returns IPRT status codes. */
    1115 typedef DECLCALLBACK(int)   AVLGCPHYSCALLBACK(PAVLGCPHYSNODECORE pNode, void *pvUser);
     1115typedef DECLCALLBACKTYPE(int, AVLGCPHYSCALLBACK,(PAVLGCPHYSNODECORE pNode, void *pvUser));
    11161116/** Pointer to callback function for RTAvlGCPhysDoWithAll() and RTAvlGCPhysDestroy(). */
    11171117typedef AVLGCPHYSCALLBACK *PAVLGCPHYSCALLBACK;
    … …  
    11601160/** Callback function for RTAvlrGCPtrDoWithAll() and RTAvlrGCPtrDestroy().
    11611161 *  @returns IPRT status codes. */
    1162 typedef DECLCALLBACK(int)   AVLRFOFFCALLBACK(PAVLRFOFFNODECORE pNode, void *pvUser);
     1162typedef DECLCALLBACKTYPE(int, AVLRFOFFCALLBACK,(PAVLRFOFFNODECORE pNode, void *pvUser));
    11631163/** Pointer to callback function for RTAvlrGCPtrDoWithAll() and RTAvlrGCPtrDestroy(). */
    11641164typedef AVLRFOFFCALLBACK *PAVLRFOFFCALLBACK;

  • trunk/include/iprt/cdefs.h

    r85096 r85121  
    13121312#endif
    13131313
     1314/** @def RT_CB_LOG_CAST
     1315 * Helper for logging function pointers to function may throw stuff.
     1316 *
     1317 * Not needed for function pointer types declared using our DECLCALLBACK
     1318 * macros, only external types. */
     1319#if defined(_MSC_VER) && defined(RT_EXCEPTIONS_ENABLED)
     1320# define RT_CB_LOG_CAST(a_pfnCallback) ((uintptr_t)(a_pfnCallback) + 1 - 1)
     1321#else
     1322# define RT_CB_LOG_CAST(a_pfnCallback) (a_pfnCallback)
     1323#endif
     1324
    13141325
    13151326
    … …  
    14881499
    14891500/** @def DECLCALLBACK
     1501 * How to declare an call back function.
     1502 * @param   type    The return type of the function declaration.
     1503 * @note    Use DECLCALLBACKTYPE for typedefs.
     1504 */
     1505#define DECLCALLBACK(type)          DECL_NOTHROW(type RT_FAR_CODE RTCALL)
     1506
     1507/** @def DECLCALLBACKTYPE_EX
    14901508 * How to declare an call back function type.
    14911509 * @param   type    The return type of the function declaration.
    1492  */
    1493 #ifdef _MSC_VER
    1494 # define DECLCALLBACK(type)         type RT_FAR_CODE RTCALL
    1495 #else
    1496 # define DECLCALLBACK(type)         DECL_NOTHROW_TYPEDEF(type RT_FAR_CODE RTCALL)
    1497 #endif
    1498 
     1510 * @param   cconv   Calling convention.
     1511 * @param   name    The name of the typedef
     1512 * @param   args    The argument list enclosed in parentheses.
     1513 * @note    DECL_NOTHROW is implied, but not supported by all compilers yet.
     1514 */
     1515#if RT_CLANG_PREREQ(6,0)
     1516# define DECLCALLBACKTYPE_EX(type, cconv, name, args)   __attribute__((__nothrow__)) type cconv name args
     1517#elif defined(_MSC_VER) && defined(__cplusplus) && defined(_MSC_EXTENSIONS)
     1518# define DECLCALLBACKTYPE_EX(type, cconv, name, args)   type cconv name args throw()
     1519#else
     1520# define DECLCALLBACKTYPE_EX(type, cconv, name, args)   type cconv name args
     1521#endif
     1522/** @def DECLCALLBACKTYPE
     1523 * How to declare an call back function type.
     1524 * @param   type    The return type of the function declaration.
     1525 * @param   name    The name of the typedef
     1526 * @param   args    The argument list enclosed in parentheses.
     1527 * @note    DECL_NOTHROW is implied, but not supported by all compilers yet.
     1528 */
     1529#define DECLCALLBACKTYPE(type, name, args)              DECLCALLBACKTYPE_EX(type, RT_FAR_CODE RTCALL, name, args)
     1530
     1531/** @def DECLCALLBACKPTR_EX
     1532 * How to declare an call back function pointer.
     1533 * @param   type    The return type of the function declaration.
     1534 * @param   cconv   Calling convention.
     1535 * @param   name    The name of the variable member.
     1536 * @param   args    The argument list enclosed in parentheses.
     1537 * @note    DECL_NOTHROW is implied, but not supported by all compilers yet.
     1538 */
     1539#if defined(__IBMC__) || defined(__IBMCPP__)
     1540# define DECLCALLBACKPTR_EX(type, cconv, name, args)    type (* cconv name) args
     1541#elif RT_CLANG_PREREQ(6,0)
     1542# define DECLCALLBACKPTR_EX(type, cconv, name, args)    __attribute__((__nothrow__)) type (cconv * name) args
     1543#elif defined(_MSC_VER) && defined(__cplusplus) && defined(_MSC_EXTENSIONS)
     1544# define DECLCALLBACKPTR_EX(type, cconv, name, args)    type (cconv * name) args throw()
     1545#else
     1546# define DECLCALLBACKPTR_EX(type, cconv, name, args)    type (cconv * name) args
     1547#endif
    14991548/** @def DECLCALLBACKPTR
    15001549 * How to declare an call back function pointer.
    15011550 * @param   type    The return type of the function declaration.
    15021551 * @param   name    The name of the variable member.
     1552 * @param   args    The argument list enclosed in parentheses.
    15031553 * @note    DECL_NOTHROW is implied, but not supported by all compilers yet.
    15041554 */
     1555#define DECLCALLBACKPTR(type, name, args)               DECLCALLBACKPTR_EX(type, RT_FAR_CODE RTCALL, name, args)
     1556
     1557/** @def DECLCALLBACKMEMBER_EX
     1558 * How to declare an call back function pointer member.
     1559 * @param   type    The return type of the function declaration.
     1560 * @param   cconv   Calling convention.
     1561 * @param   name    The name of the struct/union/class member.
     1562 * @param   args    The argument list enclosed in parentheses.
     1563 * @note    DECL_NOTHROW is implied, but not supported by all compilers yet.
     1564 */
    15051565#if defined(__IBMC__) || defined(__IBMCPP__)
    1506 # define DECLCALLBACKPTR(type, name)    type (* RTCALL name)
    1507 #else
    1508 # define DECLCALLBACKPTR(type, name)    DECL_NOTHROW_PFN(type, RT_FAR_CODE RTCALL, name)
    1509 #endif
    1510 
     1566# define DECLCALLBACKMEMBER_EX(type, cconv, name, args) type (* cconv name) args
     1567#elif RT_CLANG_PREREQ(6,0)
     1568# define DECLCALLBACKMEMBER_EX(type, cconv, name, args) __attribute__((__nothrow__)) type (cconv *name) args
     1569#elif defined(_MSC_VER) && defined(__cplusplus) && defined(_MSC_EXTENSIONS)
     1570# define DECLCALLBACKMEMBER_EX(type, cconv, name, args) type (cconv *name) args throw()
     1571#else
     1572# define DECLCALLBACKMEMBER_EX(type, cconv, name, args) type (cconv *name) args
     1573#endif
    15111574/** @def DECLCALLBACKMEMBER
    15121575 * How to declare an call back function pointer member.
    15131576 * @param   type    The return type of the function declaration.
    15141577 * @param   name    The name of the struct/union/class member.
     1578 * @param   args    The argument list enclosed in parentheses.
    15151579 * @note    DECL_NOTHROW is implied, but not supported by all compilers yet.
    1516  */
    1517 #if defined(__IBMC__) || defined(__IBMCPP__)
    1518 # define DECLCALLBACKMEMBER(type, name) type (* RTCALL name)
    1519 #else
    1520 # define DECLCALLBACKMEMBER(type, name) DECL_NOTHROW_PFN(type, RT_FAR_CODE RTCALL, name)
    1521 #endif
     1580 * @note    Will be renamed to DECLCALLBACKMEMBER.
     1581 */
     1582#define DECLCALLBACKMEMBER(type, name, args)   DECLCALLBACKMEMBER_EX(type, RT_FAR_CODE RTCALL, name, args)
    15221583
    15231584/** @def DECLR3CALLBACKMEMBER
    … …  
    15291590 */
    15301591#if defined(IN_RING3) || defined(DOXYGEN_RUNNING)
    1531 # define DECLR3CALLBACKMEMBER(type, name, args)  DECLCALLBACKMEMBER(type, name) args
    1532 #else
    1533 # define DECLR3CALLBACKMEMBER(type, name, args)  RTR3PTR name
     1592# define DECLR3CALLBACKMEMBER(type, name, args) DECLCALLBACKMEMBER(type, name, args)
     1593#else
     1594# define DECLR3CALLBACKMEMBER(type, name, args) RTR3PTR name
    15341595#endif
    15351596
    … …  
    15421603 */
    15431604#if defined(IN_RC) || defined(DOXYGEN_RUNNING)
    1544 # define DECLRCCALLBACKMEMBER(type, name, args)  DECLCALLBACKMEMBER(type, name)  args
    1545 #else
    1546 # define DECLRCCALLBACKMEMBER(type, name, args)  RTRCPTR name
     1605# define DECLRCCALLBACKMEMBER(type, name, args) DECLCALLBACKMEMBER(type, name, args)
     1606#else
     1607# define DECLRCCALLBACKMEMBER(type, name, args) RTRCPTR name
    15471608#endif
    15481609#if defined(IN_RC) || defined(DOXYGEN_RUNNING)
    1549 # define DECLRGCALLBACKMEMBER(type, name, args)  DECLCALLBACKMEMBER(type, name)  args
    1550 #else
    1551 # define DECLRGCALLBACKMEMBER(type, name, args)  RTRGPTR name
     1610# define DECLRGCALLBACKMEMBER(type, name, args) DECLCALLBACKMEMBER(type, name, args)
     1611#else
     1612# define DECLRGCALLBACKMEMBER(type, name, args) RTRGPTR name
    15521613#endif
    15531614
    … …  
    15601621 */
    15611622#if defined(IN_RING0) || defined(DOXYGEN_RUNNING)
    1562 # define DECLR0CALLBACKMEMBER(type, name, args)  DECLCALLBACKMEMBER(type, name) args
    1563 #else
    1564 # define DECLR0CALLBACKMEMBER(type, name, args)  RTR0PTR name
     1623# define DECLR0CALLBACKMEMBER(type, name, args) DECLCALLBACKMEMBER(type, name, args)
     1624#else
     1625# define DECLR0CALLBACKMEMBER(type, name, args) RTR0PTR name
    15651626#endif
    15661627

  • trunk/include/iprt/cpp/restbase.h

    r82968 r85121  
    213213     *                       May return an object on failure.
    214214     */
    215     typedef DECLCALLBACK(int) FNDESERIALIZEINSTANCEFROMJSON(RTCRestJsonCursor const &a_rCursor, RTCRestObjectBase **a_ppInstance);
     215    typedef DECLCALLBACKTYPE(int, FNDESERIALIZEINSTANCEFROMJSON,(RTCRestJsonCursor const &a_rCursor, RTCRestObjectBase **a_ppInstance));
    216216    /** Pointer to a FNDESERIALIZEINSTANCEFROMJSON function. */
    217217    typedef FNDESERIALIZEINSTANCEFROMJSON *PFNDESERIALIZEINSTANCEFROMJSON;

  • trunk/include/iprt/cpp/restclient.h

    r82968 r85121  
    120120     *          is the sum of the previously returned @a *pcbActual values.
    121121     */
    122     typedef DECLCALLBACK(int) FNPRODUCER(RTCRestBinaryParameter *a_pThis, void *a_pvDst, size_t a_cbDst,
    123                                          uint64_t a_offContent, size_t *a_pcbActual) /*RT_NOEXCEPT*/;
     122    typedef DECLCALLBACKTYPE(int, FNPRODUCER,(RTCRestBinaryParameter *a_pThis, void *a_pvDst, size_t a_cbDst,
     123                                              uint64_t a_offContent, size_t *a_pcbActual)) /*RT_NOEXCEPT*/;
    124124    /** Pointer to a byte producer callback. */
    125125    typedef FNPRODUCER *PFNPRODUCER;
    … …  
    258258     *          is the sum of the previous @a a_cbSrc values.
    259259     */
    260     typedef DECLCALLBACK(int) FNCONSUMER(RTCRestBinaryResponse *a_pThis, const void *a_pvSrc, size_t a_cbSrc,
    261                                          uint32_t a_uHttpStatus, uint64_t a_offContent, uint64_t a_cbContent) /*RT_NOEXCEPT*/;
     260    typedef DECLCALLBACKTYPE(int, FNCONSUMER,(RTCRestBinaryResponse *a_pThis, const void *a_pvSrc, size_t a_cbSrc,
     261                                              uint32_t a_uHttpStatus, uint64_t a_offContent, uint64_t a_cbContent)) /*RT_NOEXCEPT*/;
    262262    /** Pointer to a byte consumer callback. */
    263263    typedef FNCONSUMER *PFNCONSUMER;

  • trunk/include/iprt/cpp/xml.h

    r84001 r85121  
    363363 */
    364364
    365 typedef xmlParserInput* FNEXTERNALENTITYLOADER(const char *aURI,
    366                                                const char *aID,
    367                                                xmlParserCtxt *aCtxt);
     365typedef DECLCALLBACKTYPE_EX(xmlParserInput *, RT_NOTHING, FNEXTERNALENTITYLOADER,(const char *aURI, const char *aID,
     366                                                                                  xmlParserCtxt *aCtxt));
    368367typedef FNEXTERNALENTITYLOADER *PFNEXTERNALENTITYLOADER;
    369368
    … …  
    11391138    struct Data *m;
    11401139
    1141     static int ReadCallback(void *aCtxt, char *aBuf, int aLen);
    1142     static int CloseCallback (void *aCtxt);
     1140    static int ReadCallback(void *aCtxt, char *aBuf, int aLen) RT_NOTHROW_PROTO;
     1141    static int CloseCallback(void *aCtxt) RT_NOTHROW_PROTO;
    11431142};
    11441143
    … …  
    11701169
    11711170private:
    1172     static int WriteCallbackForSize(void *pvUser, const char *pachBuf, int cbToWrite);
    1173     static int WriteCallbackForReal(void *pvUser, const char *pachBuf, int cbToWrite);
    1174     static int CloseCallback(void *pvUser);
     1171    static int WriteCallbackForSize(void *pvUser, const char *pachBuf, int cbToWrite) RT_NOTHROW_PROTO;
     1172    static int WriteCallbackForReal(void *pvUser, const char *pachBuf, int cbToWrite) RT_NOTHROW_PROTO;
     1173    static int CloseCallback(void *pvUser) RT_NOTHROW_PROTO;
    11751174
    11761175    /** Pointer to the destination string while we're in the write() call.   */
    … …  
    12071206    void write(const char *pcszFilename, bool fSafe);
    12081207
    1209     static int WriteCallback(void *aCtxt, const char *aBuf, int aLen);
    1210     static int CloseCallback(void *aCtxt);
     1208    static int WriteCallback(void *aCtxt, const char *aBuf, int aLen) RT_NOTHROW_PROTO;
     1209    static int CloseCallback(void *aCtxt) RT_NOTHROW_PROTO;
    12111210
    12121211    /** The suffix used by XmlFileWriter::write() for the temporary file. */

  • trunk/include/iprt/crypto/applecodesign.h

    r84509 r85121  
    252252 * @param   pvUser      User argument.
    253253 */
    254 typedef DECLCALLBACK(int) FNRTCRAPPLECSDIGESTAREA(RTCRDIGEST hDigest, size_t off, size_t cb, void *pvUser);
     254typedef DECLCALLBACKTYPE(int, FNRTCRAPPLECSDIGESTAREA,(RTCRDIGEST hDigest, size_t off, size_t cb, void *pvUser));
    255255/** Pointer to a image digest callback. */
    256256typedef FNRTCRAPPLECSDIGESTAREA *PFNRTCRAPPLECSDIGESTAREA;

  • trunk/include/iprt/crypto/digest.h

    r82968 r85121  
    6666     * Allocates the digest data.
    6767     */
    68     DECLCALLBACKMEMBER(void *, pfnNew)(void);
     68    DECLCALLBACKMEMBER(void *, pfnNew,(void));
    6969
    7070    /**
    … …  
    7373     * @param   pvState     The opaque message digest state.
    7474     */
    75     DECLCALLBACKMEMBER(void, pfnFree)(void *pvState);
     75    DECLCALLBACKMEMBER(void, pfnFree,(void *pvState));
    7676
    7777    /**
    … …  
    8282     * @param   cbData      The amount of data to add to the digest.
    8383     */
    84     DECLCALLBACKMEMBER(void, pfnUpdate)(void *pvState, const void *pvData, size_t cbData);
     84    DECLCALLBACKMEMBER(void, pfnUpdate,(void *pvState, const void *pvData, size_t cbData));
    8585
    8686    /**
    … …  
    9191     *                      least RTCRDIGESTDESC::cbHash bytes large.
    9292     */
    93     DECLCALLBACKMEMBER(void, pfnFinal)(void *pvState, uint8_t *pbHash);
     93    DECLCALLBACKMEMBER(void, pfnFinal,(void *pvState, uint8_t *pbHash));
    9494
    9595    /**
    … …  
    103103     * @param   fReInit     Set if this is a re-init call.
    104104     */
    105     DECLCALLBACKMEMBER(int, pfnInit)(void *pvState, void *pvOpaque, bool fReInit);
     105    DECLCALLBACKMEMBER(int, pfnInit,(void *pvState, void *pvOpaque, bool fReInit));
    106106
    107107    /**
    … …  
    112112     * @param   pvState     The opaque message digest state.
    113113     */
    114     DECLCALLBACKMEMBER(void, pfnDelete)(void *pvState);
     114    DECLCALLBACKMEMBER(void, pfnDelete,(void *pvState));
    115115
    116116    /**
    … …  
    123123     * @param   pvSrcState  The opaque message digest state to clone (source).
    124124     */
    125     DECLCALLBACKMEMBER(int, pfnClone)(void *pvState, void const *pvSrcState);
     125    DECLCALLBACKMEMBER(int, pfnClone,(void *pvState, void const *pvSrcState));
    126126
    127127    /**
    … …  
    135135     * @param   pvState     The opaque message digest state.
    136136     */
    137     DECLCALLBACKMEMBER(uint32_t, pfnGetHashSize)(void *pvState);
     137    DECLCALLBACKMEMBER(uint32_t, pfnGetHashSize,(void *pvState));
    138138
    139139    /**
    … …  
    143143     * @param   pvState     The opaque message digest state.
    144144     */
    145     DECLCALLBACKMEMBER(RTDIGESTTYPE, pfnGetDigestType)(void *pvState);
     145    DECLCALLBACKMEMBER(RTDIGESTTYPE, pfnGetDigestType,(void *pvState));
    146146} RTCRDIGESTDESC;
    147147/** Pointer to const message digest details and vtable. */

  • trunk/include/iprt/crypto/pkcs7.h

    r84380 r85121  
    485485 * @param   pErrInfo            Optional error info buffer.
    486486 */
    487 typedef DECLCALLBACK(int) FNRTCRPKCS7VERIFYCERTCALLBACK(PCRTCRX509CERTIFICATE pCert, RTCRX509CERTPATHS hCertPaths,
    488                                                         uint32_t fFlags, void *pvUser, PRTERRINFO pErrInfo);
     487typedef DECLCALLBACKTYPE(int, FNRTCRPKCS7VERIFYCERTCALLBACK,(PCRTCRX509CERTIFICATE pCert, RTCRX509CERTPATHS hCertPaths,
     488                                                             uint32_t fFlags, void *pvUser, PRTERRINFO pErrInfo));
    489489/** Pointer to a FNRTCRPKCS7VERIFYCERTCALLBACK callback. */
    490490typedef FNRTCRPKCS7VERIFYCERTCALLBACK *PFNRTCRPKCS7VERIFYCERTCALLBACK;

  • trunk/include/iprt/crypto/pkix.h

    r84251 r85121  
    200200     *                          none.
    201201     */
    202     DECLCALLBACKMEMBER(int, pfnInit)(struct RTCRPKIXSIGNATUREDESC const *pDesc, void *pvState, void *pvOpaque, bool fSigning,
    203                                      RTCRKEY hKey, PCRTASN1DYNTYPE pParams);
     202    DECLCALLBACKMEMBER(int, pfnInit,(struct RTCRPKIXSIGNATUREDESC const *pDesc, void *pvState, void *pvOpaque, bool fSigning,
     203                                     RTCRKEY hKey, PCRTASN1DYNTYPE pParams));
    204204
    205205    /**
    … …  
    214214     * @param   fSigning        Exactly the same value as the init call.
    215215     */
    216     DECLCALLBACKMEMBER(int, pfnReset)(struct RTCRPKIXSIGNATUREDESC const *pDesc, void *pvState, bool fSigning);
     216    DECLCALLBACKMEMBER(int, pfnReset,(struct RTCRPKIXSIGNATUREDESC const *pDesc, void *pvState, bool fSigning));
    217217
    218218    /**
    … …  
    226226     * @param   fSigning        Exactly the same value as the init call.
    227227     */
    228     DECLCALLBACKMEMBER(void, pfnDelete)(struct RTCRPKIXSIGNATUREDESC const *pDesc, void *pvState, bool fSigning);
     228    DECLCALLBACKMEMBER(void, pfnDelete,(struct RTCRPKIXSIGNATUREDESC const *pDesc, void *pvState, bool fSigning));
    229229
    230230    /**
    … …  
    249249     * @param   cbSignature     The size of the signature (in bytes).
    250250     */
    251     DECLCALLBACKMEMBER(int, pfnVerify)(struct RTCRPKIXSIGNATUREDESC const *pDesc, void *pvState, RTCRKEY hKey,
    252                                        RTCRDIGEST hDigest, void const *pvSignature, size_t cbSignature);
     251    DECLCALLBACKMEMBER(int, pfnVerify,(struct RTCRPKIXSIGNATUREDESC const *pDesc, void *pvState, RTCRKEY hKey,
     252                                       RTCRDIGEST hDigest, void const *pvSignature, size_t cbSignature));
    253253
    254254    /**
    … …  
    277277     *                          case of VERR_BUFFER_OVERFLOW.
    278278     */
    279     DECLCALLBACKMEMBER(int, pfnSign)(struct RTCRPKIXSIGNATUREDESC const *pDesc, void *pvState, RTCRKEY hKey,
    280                                      RTCRDIGEST hDigest, void *pvSignature, size_t *pcbSignature);
     279    DECLCALLBACKMEMBER(int, pfnSign,(struct RTCRPKIXSIGNATUREDESC const *pDesc, void *pvState, RTCRKEY hKey,
     280                                     RTCRDIGEST hDigest, void *pvSignature, size_t *pcbSignature));
    281281
    282282} RTCRPKIXSIGNATUREDESC;
    … …  
    435435     *                          none.
    436436     */
    437     DECLCALLBACKMEMBER(int, pfnInit)(struct RTCRPKIXENCRYPTIONDESC const *pDesc, void *pvState, void *pvOpaque, bool fEncrypt,
    438                                      PCRTASN1BITSTRING pKey, PCRTASN1DYNTYPE pParams);
     437    DECLCALLBACKMEMBER(int, pfnInit,(struct RTCRPKIXENCRYPTIONDESC const *pDesc, void *pvState, void *pvOpaque, bool fEncrypt,
     438                                     PCRTASN1BITSTRING pKey, PCRTASN1DYNTYPE pParams));
    439439
    440440    /**
    … …  
    451451     * @param   enmOperation    Same as for the earlier pfnInit call.
    452452     */
    453     DECLCALLBACKMEMBER(int, pfnReset)(struct RTCRPKIXENCRYPTIONDESC const *pDesc, void *pvState, bool fEncrypt);
     453    DECLCALLBACKMEMBER(int, pfnReset,(struct RTCRPKIXENCRYPTIONDESC const *pDesc, void *pvState, bool fEncrypt));
    454454
    455455    /**
    … …  
    464464     * @param   enmOperation    Same as for the earlier pfnInit call.
    465465     */
    466     DECLCALLBACKMEMBER(void, pfnDelete)(struct RTCRPKIXENCRYPTIONDESC const *pDesc, void *pvState, bool fEncrypt);
     466    DECLCALLBACKMEMBER(void, pfnDelete,(struct RTCRPKIXENCRYPTIONDESC const *pDesc, void *pvState, bool fEncrypt));
    467467
    468468    /**
    … …  
    487487     * @param   fFinal          Whether this is the final call.
    488488     */
    489     DECLCALLBACKMEMBER(int, pfnEncrypt)(struct RTCRPKIXENCRYPTIONDESC const *pDesc, void *pvState,
     489    DECLCALLBACKMEMBER(int, pfnEncrypt,(struct RTCRPKIXENCRYPTIONDESC const *pDesc, void *pvState,
    490490                                        void const *pvPlaintext, size_t cbPlaintext,
    491                                         void *pvCiphertext, size_t cbMaxCiphertext, size_t *pcbCiphertext, bool fFinal);
     491                                        void *pvCiphertext, size_t cbMaxCiphertext, size_t *pcbCiphertext, bool fFinal));
    492492
    493493    /**
    … …  
    503503     * @param   fFinal          Whether this is the final call.
    504504     */
    505     DECLCALLBACKMEMBER(int, pfnEncryptLength)(struct RTCRPKIXENCRYPTIONDESC const *pDesc, void *pvState,
    506                                               size_t cbPlaintext, size_t *pcbCiphertext, bool fFinal);
     505    DECLCALLBACKMEMBER(int, pfnEncryptLength,(struct RTCRPKIXENCRYPTIONDESC const *pDesc, void *pvState,
     506                                              size_t cbPlaintext, size_t *pcbCiphertext, bool fFinal));
    507507
    508508    /**
    … …  
    527527     * @param   fFinal          Whether this is the final call.
    528528     */
    529     DECLCALLBACKMEMBER(int, pfnDecrypt)(struct RTCRPKIXENCRYPTIONDESC const *pDesc, void *pvState,
     529    DECLCALLBACKMEMBER(int, pfnDecrypt,(struct RTCRPKIXENCRYPTIONDESC const *pDesc, void *pvState,
    530530                                        void const *pvCiphertext, size_t cbCiphertext,
    531                                         void *pvPlaintext, size_t cbMaxPlaintext, size_t *pcbPlaintext, bool fFinal);
     531                                        void *pvPlaintext, size_t cbMaxPlaintext, size_t *pcbPlaintext, bool fFinal));
    532532
    533533    /**
    … …  
    543543     * @param   fFinal          Whether this is the final call.
    544544     */
    545     DECLCALLBACKMEMBER(int, pfnDecryptLength)(struct RTCRPKIXENCRYPTIONDESC const *pDesc, void *pvState,
    546                                               size_t cbCiphertext, size_t *pcbPlaintext, bool fFinal);
     545    DECLCALLBACKMEMBER(int, pfnDecryptLength,(struct RTCRPKIXENCRYPTIONDESC const *pDesc, void *pvState,
     546                                              size_t cbCiphertext, size_t *pcbPlaintext, bool fFinal));
    547547} RTCRPKIXENCRYPTIONDESC;
    548548/** Pointer to a public key encryption schema provider descriptor. */

  • trunk/include/iprt/dbg.h

    r83085 r85121  
    283283     * @param   pvDst       Where to put the bytes we read.
    284284     */
    285     DECLCALLBACKMEMBER(int, pfnReadStack)(struct RTDBGUNWINDSTATE *pThis, RTUINTPTR uSp, size_t cbToRead, void *pvDst);
     285    DECLCALLBACKMEMBER(int, pfnReadStack,(struct RTDBGUNWINDSTATE *pThis, RTUINTPTR uSp, size_t cbToRead, void *pvDst));
    286286    /** User argument (useful for pfnReadStack). */
    287287    void               *pvUser;
    … …  
    653653 * @param   pvUser          User argument.
    654654 */
    655 typedef DECLCALLBACK(void) FNRTDBGCFGLOG(RTDBGCFG hDbgCfg, uint32_t iLevel, const char *pszMsg, void *pvUser);
     655typedef DECLCALLBACKTYPE(void, FNRTDBGCFGLOG,(RTDBGCFG hDbgCfg, uint32_t iLevel, const char *pszMsg, void *pvUser));
    656656/** Pointer to a log callback. */
    657657typedef FNRTDBGCFGLOG *PFNRTDBGCFGLOG;
    … …  
    686686 * @param   pvUser2             Second user parameter.
    687687 */
    688 typedef DECLCALLBACK(int) FNRTDBGCFGOPEN(RTDBGCFG hDbgCfg, const char *pszFilename, void *pvUser1, void *pvUser2);
     688typedef DECLCALLBACKTYPE(int, FNRTDBGCFGOPEN,(RTDBGCFG hDbgCfg, const char *pszFilename, void *pvUser1, void *pvUser2));
    689689/** Pointer to a open-file callback used to the RTDbgCfgOpen functions. */
    690690typedef FNRTDBGCFGOPEN *PFNRTDBGCFGOPEN;

  • trunk/include/iprt/dvm.h

    r82968 r85121  
    154154 * @param   pfAllocated    Where to store the allocation status on success.
    155155 */
    156 typedef DECLCALLBACK(int) FNDVMVOLUMEQUERYBLOCKSTATUS(void *pvUser, uint64_t off,
    157                                                       uint64_t cb, bool *pfAllocated);
     156typedef DECLCALLBACKTYPE(int, FNDVMVOLUMEQUERYBLOCKSTATUS,(void *pvUser, uint64_t off, uint64_t cb, bool *pfAllocated));
    158157/** Pointer to a query block allocation status callback. */
    159158typedef FNDVMVOLUMEQUERYBLOCKSTATUS *PFNDVMVOLUMEQUERYBLOCKSTATUS;

  • trunk/include/iprt/errcore.h

    r85076 r85121  
    293293 * @param   cbChars     Number of bytes in the character array pointed to by pachChars.
    294294 */
    295 typedef DECLCALLBACK(size_t) FNRTSTROUTPUT(void *pvArg, const char *pachChars, size_t cbChars);
     295typedef DECLCALLBACKTYPE(size_t, FNRTSTROUTPUT,(void *pvArg, const char *pachChars, size_t cbChars));
    296296/** Pointer to callback function. */
    297297typedef FNRTSTROUTPUT *PFNRTSTROUTPUT;

  • trunk/include/iprt/fs.h

    r82968 r85121  
    624624 * @param   pvUser          The user argument.
    625625 */
    626 typedef DECLCALLBACK(int) FNRTFSMOUNTPOINTENUM(const char *pszMountpoint, void *pvUser);
     626typedef DECLCALLBACKTYPE(int, FNRTFSMOUNTPOINTENUM,(const char *pszMountpoint, void *pvUser));
    627627/** Pointer to a FNRTFSMOUNTPOINTENUM(). */
    628628typedef FNRTFSMOUNTPOINTENUM *PFNRTFSMOUNTPOINTENUM;

  • trunk/include/iprt/ftp.h

    r82841 r85121  
    223223     * @param   pcszUser        User name.
    224224     */
    225     DECLCALLBACKMEMBER(int,  pfnOnUserConnect)(PRTFTPCALLBACKDATA pData, const char *pcszUser);
     225    DECLCALLBACKMEMBER(int, pfnOnUserConnect,(PRTFTPCALLBACKDATA pData, const char *pcszUser));
    226226    /**
    227227     * Callback which gets invoked when a user tries to authenticate with a password.
    … …  
    232232     * @param   pcszPassword    Password to authenticate with.
    233233     */
    234     DECLCALLBACKMEMBER(int,  pfnOnUserAuthenticate)(PRTFTPCALLBACKDATA pData, const char *pcszUser, const char *pcszPassword);
     234    DECLCALLBACKMEMBER(int, pfnOnUserAuthenticate,(PRTFTPCALLBACKDATA pData, const char *pcszUser, const char *pcszPassword));
    235235    /**
    236236     * Callback which gets invoked when a user disconnected.
    … …  
    240240     * @param   pcszUser        User name which disconnected.
    241241     */
    242     DECLCALLBACKMEMBER(int,  pfnOnUserDisconnect)(PRTFTPCALLBACKDATA pData, const char *pcszUser);
     242    DECLCALLBACKMEMBER(int, pfnOnUserDisconnect,(PRTFTPCALLBACKDATA pData, const char *pcszUser));
    243243    /**
    244244     * Callback which gets invoked when the client wants to start reading or writing a file.
    … …  
    250250     * @param   ppvHandle       Opaque file handle only known to the callback implementation.
    251251     */
    252     DECLCALLBACKMEMBER(int,  pfnOnFileOpen)(PRTFTPCALLBACKDATA pData, const char *pcszPath, uint32_t fMode, void **ppvHandle);
     252    DECLCALLBACKMEMBER(int, pfnOnFileOpen,(PRTFTPCALLBACKDATA pData, const char *pcszPath, uint32_t fMode, void **ppvHandle));
    253253    /**
    254254     * Callback which gets invoked when the client wants to read from a file.
    … …  
    261261     * @param   pcbRead         How much (in bytes) was read. Optional.
    262262     */
    263     DECLCALLBACKMEMBER(int,  pfnOnFileRead)(PRTFTPCALLBACKDATA pData, void *pvHandle, void *pvBuf, size_t cbToRead, size_t *pcbRead);
     263    DECLCALLBACKMEMBER(int, pfnOnFileRead,(PRTFTPCALLBACKDATA pData, void *pvHandle, void *pvBuf, size_t cbToRead, size_t *pcbRead));
    264264    /**
    265265     * Callback which gets invoked when the client is done reading from or writing to a file.
    … …  
    269269     * @param   ppvHandle       Opaque file handle only known to the callback implementation.
    270270     */
    271     DECLCALLBACKMEMBER(int,  pfnOnFileClose)(PRTFTPCALLBACKDATA pData, void *pvHandle);
     271    DECLCALLBACKMEMBER(int, pfnOnFileClose,(PRTFTPCALLBACKDATA pData, void *pvHandle));
    272272    /**
    273273     * Callback which gets invoked when the client wants to retrieve the size of a specific file.
    … …  
    278278     * @param   puSize          Where to store the file size on success.
    279279     */
    280     DECLCALLBACKMEMBER(int,  pfnOnFileGetSize)(PRTFTPCALLBACKDATA pData, const char *pcszPath, uint64_t *puSize);
     280    DECLCALLBACKMEMBER(int, pfnOnFileGetSize,(PRTFTPCALLBACKDATA pData, const char *pcszPath, uint64_t *puSize));
    281281    /**
    282282     * Callback which gets invoked when the client wants to retrieve information about a file.
    … …  
    288288     * @returns VBox status code.
    289289     */
    290     DECLCALLBACKMEMBER(int,  pfnOnFileStat)(PRTFTPCALLBACKDATA pData, const char *pcszPath, PRTFSOBJINFO pFsObjInfo);
     290    DECLCALLBACKMEMBER(int, pfnOnFileStat,(PRTFTPCALLBACKDATA pData, const char *pcszPath, PRTFSOBJINFO pFsObjInfo));
    291291    /**
    292292     * Callback which gets invoked when setting the current working directory.
    … …  
    296296     * @param   pcszCWD         Current working directory to set.
    297297     */
    298     DECLCALLBACKMEMBER(int,  pfnOnPathSetCurrent)(PRTFTPCALLBACKDATA pData, const char *pcszCWD);
     298    DECLCALLBACKMEMBER(int, pfnOnPathSetCurrent,(PRTFTPCALLBACKDATA pData, const char *pcszCWD));
    299299    /**
    300300     * Callback which gets invoked when a client wants to retrieve the current working directory.
    … …  
    305305     * @param   cbPWD           Size of buffer in bytes.
    306306     */
    307     DECLCALLBACKMEMBER(int,  pfnOnPathGetCurrent)(PRTFTPCALLBACKDATA pData, char *pszPWD, size_t cbPWD);
     307    DECLCALLBACKMEMBER(int, pfnOnPathGetCurrent,(PRTFTPCALLBACKDATA pData, char *pszPWD, size_t cbPWD));
    308308    /**
    309309     * Callback which gets invoked when the client wants to move up a directory (relative to the current working directory).
    … …  
    312312     * @param   pData           Pointer to generic callback data.
    313313     */
    314     DECLCALLBACKMEMBER(int,  pfnOnPathUp)(PRTFTPCALLBACKDATA pData);
     314    DECLCALLBACKMEMBER(int, pfnOnPathUp,(PRTFTPCALLBACKDATA pData));
    315315    /**
    316316     * Callback which gets invoked when the server wants to open a directory for reading.
    … …  
    322322     * @param   ppvHandle       Where to return the opaque directory handle.
    323323     */
    324     DECLCALLBACKMEMBER(int,  pfnOnDirOpen)(PRTFTPCALLBACKDATA pData, const char *pcszPath, void **ppvHandle);
     324    DECLCALLBACKMEMBER(int, pfnOnDirOpen,(PRTFTPCALLBACKDATA pData, const char *pcszPath, void **ppvHandle));
    325325    /**
    326326     * Callback which gets invoked when the server wants to close a directory handle.
    … …  
    330330     * @param   pvHandle        Directory handle to close.
    331331     */
    332     DECLCALLBACKMEMBER(int,  pfnOnDirClose)(PRTFTPCALLBACKDATA pData, void *pvHandle);
     332    DECLCALLBACKMEMBER(int, pfnOnDirClose,(PRTFTPCALLBACKDATA pData, void *pvHandle));
    333333    /**
    334334     * Callback which gets invoked when the server wants to read the next directory entry.
    … …  
    343343     * @param   ppszTarget      Where to return the allocated string of the target (if a link). Currently unused.
    344344     */
    345     DECLCALLBACKMEMBER(int, pfnOnDirRead)(PRTFTPCALLBACKDATA pData, void *pvHandle, char **ppszEntry,
    346                                           PRTFSOBJINFO pInfo, char **ppszOwner, char **ppszGroup, char **ppszTarget);
     345    DECLCALLBACKMEMBER(int, pfnOnDirRead,(PRTFTPCALLBACKDATA pData, void *pvHandle, char **ppszEntry,
     346                                          PRTFSOBJINFO pInfo, char **ppszOwner, char **ppszGroup, char **ppszTarget));
    347347} RTFTPSERVERCALLBACKS;
    348348/** Pointer to a FTP server callback data table. */

  • trunk/include/iprt/fuzz.h

    r83428 r85121  
    170170 * @param   pvUser              Opaque user data passed in RTFuzzCtxStateExport().
    171171 */
    172 typedef DECLCALLBACK(int) FNRTFUZZCTXEXPORT(RTFUZZCTX hFuzzCtx, const void *pvBuf, size_t cbWrite, void *pvUser);
     172typedef DECLCALLBACKTYPE(int, FNRTFUZZCTXEXPORT,(RTFUZZCTX hFuzzCtx, const void *pvBuf, size_t cbWrite, void *pvUser));
    173173/** Pointer to a fuzzing context state export callback. */
    174174typedef FNRTFUZZCTXEXPORT *PFNRTFUZZCTXEXPORT;
    … …  
    184184 * @param   pvUser              Opaque user data passed in RTFuzzCtxCreateFromState().
    185185 */
    186 typedef DECLCALLBACK(int) FNRTFUZZCTXIMPORT(RTFUZZCTX hFuzzCtx, void *pvBuf, size_t cbRead, size_t *pcbRead, void *pvUser);
     186typedef DECLCALLBACKTYPE(int, FNRTFUZZCTXIMPORT,(RTFUZZCTX hFuzzCtx, void *pvBuf, size_t cbRead, size_t *pcbRead, void *pvUser));
    187187/** Pointer to a fuzzing context state export callback. */
    188188typedef FNRTFUZZCTXIMPORT *PFNRTFUZZCTXIMPORT;
    … …  
    938938 * @param   pvUser              Opaque user data.
    939939 */
    940 typedef DECLCALLBACK(int) FNFUZZCLIENTCONSUME(const void *pvBuf, size_t cbBuf, void *pvUser);
     940typedef DECLCALLBACKTYPE(int, FNFUZZCLIENTCONSUME,(const void *pvBuf, size_t cbBuf, void *pvUser));
    941941/** Pointer to a client consumption callback. */
    942942typedef FNFUZZCLIENTCONSUME *PFNFUZZCLIENTCONSUME;

  • trunk/include/iprt/handletable.h

    r82968 r85121  
    6464 * @param   pvUser          The user context argument specified when creating the table.
    6565 */
    66 typedef DECLCALLBACK(int) FNRTHANDLETABLERETAIN(RTHANDLETABLE hHandleTable, void *pvObj, void *pvCtx, void *pvUser);
     66typedef DECLCALLBACKTYPE(int, FNRTHANDLETABLERETAIN,(RTHANDLETABLE hHandleTable, void *pvObj, void *pvCtx, void *pvUser));
    6767/** Pointer to a FNHANDLETABLERETAIN. */
    6868typedef FNRTHANDLETABLERETAIN *PFNRTHANDLETABLERETAIN;
    … …  
    7979 *
    8080 */
    81 typedef DECLCALLBACK(void) FNRTHANDLETABLEDELETE(RTHANDLETABLE hHandleTable, uint32_t h, void *pvObj, void *pvCtx, void *pvUser);
     81typedef DECLCALLBACKTYPE(void, FNRTHANDLETABLEDELETE,(RTHANDLETABLE hHandleTable, uint32_t h, void *pvObj, void *pvCtx, void *pvUser));
    8282/** Pointer to a FNRTHANDLETABLEDELETE. */
    8383typedef FNRTHANDLETABLEDELETE *PFNRTHANDLETABLEDELETE;

  • trunk/include/iprt/heap.h

    r82968 r85121  
    184184 * @param   ...         Format arguments.
    185185 */
    186 typedef DECLCALLBACK(void) FNRTHEAPSIMPLEPRINTF(const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(1, 2);
     186typedef DECLCALLBACKTYPE(void, FNRTHEAPSIMPLEPRINTF,(const char *pszFormat, ...)) RT_IPRT_FORMAT_ATTR(1, 2);
    187187/** Pointer to a FNRTHEAPSIMPLEPRINTF function. */
    188188typedef FNRTHEAPSIMPLEPRINTF *PFNRTHEAPSIMPLEPRINTF;
    … …  
    339339 * @param   ...         Format arguments.
    340340 */
    341 typedef DECLCALLBACK(void) FNRTHEAPOFFSETPRINTF(const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(1, 2);
     341typedef DECLCALLBACKTYPE(void, FNRTHEAPOFFSETPRINTF,(const char *pszFormat, ...)) RT_IPRT_FORMAT_ATTR(1, 2);
    342342/** Pointer to a FNRTHEAPOFFSETPRINTF function. */
    343343typedef FNRTHEAPOFFSETPRINTF *PFNRTHEAPOFFSETPRINTF;

  • trunk/include/iprt/http.h

    r82968 r85121  
    515515 * @param   cbDowloaded     How much was downloaded thus far.
    516516 */
    517 typedef DECLCALLBACK(void) FNRTHTTPDOWNLDPROGRCALLBACK(RTHTTP hHttp, void *pvUser, uint64_t cbDownloadTotal, uint64_t cbDownloaded);
     517typedef DECLCALLBACKTYPE(void, FNRTHTTPDOWNLDPROGRCALLBACK,(RTHTTP hHttp, void *pvUser, uint64_t cbDownloadTotal,
     518                                                            uint64_t cbDownloaded));
    518519/** Pointer to a download progress callback. */
    519520typedef FNRTHTTPDOWNLDPROGRCALLBACK *PFNRTHTTPDOWNLDPROGRCALLBACK;
    … …  
    546547 *          value is the sum of the previous @a cbBuf values.
    547548 */
    548 typedef DECLCALLBACK(int) FNRTHTTPDOWNLOADCALLBACK(RTHTTP hHttp, void const *pvBuf, size_t cbBuf, uint32_t uHttpStatus,
    549                                                    uint64_t offContent, uint64_t cbContent, void *pvUser);
     549typedef DECLCALLBACKTYPE(int, FNRTHTTPDOWNLOADCALLBACK,(RTHTTP hHttp, void const *pvBuf, size_t cbBuf, uint32_t uHttpStatus,
     550                                                        uint64_t offContent, uint64_t cbContent, void *pvUser));
    550551/** Pointer to a download data receiver callback. */
    551552typedef FNRTHTTPDOWNLOADCALLBACK *PFNRTHTTPDOWNLOADCALLBACK;
    … …  
    594595 *          value is the sum of the previously returned @a *pcbActual values.
    595596 */
    596 typedef DECLCALLBACK(int) FNRTHTTPUPLOADCALLBACK(RTHTTP hHttp, void *pvBuf, size_t cbBuf, uint64_t offContent,
    597                                                  size_t *pcbActual, void *pvUser);
     597typedef DECLCALLBACKTYPE(int, FNRTHTTPUPLOADCALLBACK,(RTHTTP hHttp, void *pvBuf, size_t cbBuf, uint64_t offContent,
     598                                                      size_t *pcbActual, void *pvUser));
    598599/** Pointer to an upload data producer callback. */
    599600typedef FNRTHTTPUPLOADCALLBACK *PFNRTHTTPUPLOADCALLBACK;
    … …  
    631632 *              - ':end-of-headers'   -- marks the end of header callbacks.
    632633 */
    633 typedef DECLCALLBACK(int) FNRTHTTPHEADERCALLBACK(RTHTTP hHttp, uint32_t uMatchWord, const char *pchField, size_t cchField,
    634                                                  const char *pchValue, size_t cchValue, void *pvUser);
     634typedef DECLCALLBACKTYPE(int, FNRTHTTPHEADERCALLBACK,(RTHTTP hHttp, uint32_t uMatchWord, const char *pchField, size_t cchField,
     635                                                      const char *pchValue, size_t cchValue, void *pvUser));
    635636/** Pointer to a header field consumer callback. */
    636637typedef FNRTHTTPHEADERCALLBACK *PFNRTHTTPHEADERCALLBACK;
    … …  
    662663
    663664/** @name thin wrappers for setting one or a few related curl options
    664  * @remarks Temporary. Will not be included in the 6.0 release!
     665 * @remarks Temporary. Will not be included in the 7.0 release!
    665666 * @{ */
    666 typedef size_t FNRTHTTPREADCALLBACKRAW(void *pbDst, size_t cbItem, size_t cItems, void *pvUser);
     667typedef DECLCALLBACKTYPE_EX(size_t, RT_NOTHING, FNRTHTTPREADCALLBACKRAW,(void *pbDst, size_t cbItem, size_t cItems, void *pvUser));
    667668typedef FNRTHTTPREADCALLBACKRAW *PFNRTHTTPREADCALLBACKRAW;
    668669#define RT_HTTP_READCALLBACK_ABORT 0x10000000 /* CURL_READFUNC_ABORT */
    669670RTR3DECL(int) RTHttpRawSetReadCallback(RTHTTP hHttp, PFNRTHTTPREADCALLBACKRAW pfnRead, void *pvUser);
    670671
    671 typedef size_t FNRTHTTPWRITECALLBACKRAW(char *pbSrc, size_t cbItem, size_t cItems, void *pvUser);
     672typedef DECLCALLBACKTYPE_EX(size_t, RT_NOTHING, FNRTHTTPWRITECALLBACKRAW,(char *pbSrc, size_t cbItem, size_t cItems, void *pvUser));
    672673typedef FNRTHTTPWRITECALLBACKRAW *PFNRTHTTPWRITECALLBACKRAW;
    673674RTR3DECL(int) RTHttpRawSetWriteCallback(RTHTTP hHttp, PFNRTHTTPWRITECALLBACKRAW pfnWrite, void *pvUser);

  • trunk/include/iprt/initterm.h

    r82968 r85121  
    207207 * @param   pvUser              User argument passed to RTTermRegisterCallback.
    208208 */
    209 typedef DECLCALLBACK(void) FNRTTERMCALLBACK(RTTERMREASON enmReason, int32_t iStatus, void *pvUser);
     209typedef DECLCALLBACKTYPE(void, FNRTTERMCALLBACK,(RTTERMREASON enmReason, int32_t iStatus, void *pvUser));
    210210/** Pointer to an IPRT termination callback function. */
    211211typedef FNRTTERMCALLBACK *PFNRTTERMCALLBACK;

  • trunk/include/iprt/ioqueue.h

    r82968 r85121  
    113113     * @returns Flag whether the provider is supported.
    114114     */
    115     DECLCALLBACKMEMBER(bool, pfnIsSupported) (void);
     115    DECLCALLBACKMEMBER(bool, pfnIsSupported,(void));
    116116
    117117    /**
    … …  
    124124     * @param   cCqEntries      Number of entries for the completion queue.
    125125     */
    126     DECLCALLBACKMEMBER(int, pfnQueueInit) (RTIOQUEUEPROV hIoQueueProv, uint32_t fFlags,
    127                                            uint32_t cSqEntries, uint32_t cCqEntries);
     126    DECLCALLBACKMEMBER(int, pfnQueueInit,(RTIOQUEUEPROV hIoQueueProv, uint32_t fFlags, uint32_t cSqEntries, uint32_t cCqEntries));
    128127
    129128    /**
    … …  
    134133     * @param   hIoQueueProv    The I/O queue provider instance to destroy.
    135134     */
    136     DECLCALLBACKMEMBER(void, pfnQueueDestroy) (RTIOQUEUEPROV hIoQueueProv);
     135    DECLCALLBACKMEMBER(void, pfnQueueDestroy,(RTIOQUEUEPROV hIoQueueProv));
    137136
    138137    /**
    … …  
    145144     * @param   pHandle         The handle to register.
    146145     */
    147     DECLCALLBACKMEMBER(int, pfnHandleRegister) (RTIOQUEUEPROV hIoQueueProv, PCRTHANDLE pHandle);
     146    DECLCALLBACKMEMBER(int, pfnHandleRegister,(RTIOQUEUEPROV hIoQueueProv, PCRTHANDLE pHandle));
    148147
    149148    /**
    … …  
    156155     * @param   pHandle         The handle to deregister.
    157156     */
    158     DECLCALLBACKMEMBER(int, pfnHandleDeregister) (RTIOQUEUEPROV hIoQueueProv, PCRTHANDLE pHandle);
     157    DECLCALLBACKMEMBER(int, pfnHandleDeregister,(RTIOQUEUEPROV hIoQueueProv, PCRTHANDLE pHandle));
    159158
    160159    /**
    … …  
    171170     * @param   pvUser              Opaque user data which is passed back in the completion event.
    172171     */
    173     DECLCALLBACKMEMBER(int, pfnReqPrepare) (RTIOQUEUEPROV hIoQueueProv, PCRTHANDLE pHandle, RTIOQUEUEOP enmOp,
    174                                             uint64_t off, void *pvBuf, size_t cbBuf, uint32_t fReqFlags,
    175                                             void *pvUser);
     172    DECLCALLBACKMEMBER(int, pfnReqPrepare,(RTIOQUEUEPROV hIoQueueProv, PCRTHANDLE pHandle, RTIOQUEUEOP enmOp,
     173                                           uint64_t off, void *pvBuf, size_t cbBuf, uint32_t fReqFlags, void *pvUser));
    176174
    177175    /**
    … …  
    188186     * @param   pvUser              Opaque user data which is passed back in the completion event.
    189187     */
    190     DECLCALLBACKMEMBER(int, pfnReqPrepareSg) (RTIOQUEUEPROV hIoQueueProv, PCRTHANDLE pHandle, RTIOQUEUEOP enmOp,
    191                                               uint64_t off, PCRTSGBUF pSgBuf, size_t cbSg, uint32_t fReqFlags,
    192                                               void *pvUser);
     188    DECLCALLBACKMEMBER(int, pfnReqPrepareSg,(RTIOQUEUEPROV hIoQueueProv, PCRTHANDLE pHandle, RTIOQUEUEOP enmOp,
     189                                             uint64_t off, PCRTSGBUF pSgBuf, size_t cbSg, uint32_t fReqFlags, void *pvUser));
    193190
    194191    /**
    … …  
    199196     * @param   pcReqsCommitted     Where to store the number of requests actually committed.
    200197     */
    201     DECLCALLBACKMEMBER(int, pfnCommit) (RTIOQUEUEPROV hIoQueueProv, uint32_t *pcReqsCommitted);
     198    DECLCALLBACKMEMBER(int, pfnCommit,(RTIOQUEUEPROV hIoQueueProv, uint32_t *pcReqsCommitted));
    202199
    203200    /**
    … …  
    213210     * @param   fFlags              Additional flags controlling the wait behavior.
    214211     */
    215     DECLCALLBACKMEMBER(int, pfnEvtWait) (RTIOQUEUEPROV hIoQueueProv, PRTIOQUEUECEVT paCEvt, uint32_t cCEvt,
    216                                          uint32_t cMinWait, uint32_t *pcCEvt, uint32_t fFlags);
     212    DECLCALLBACKMEMBER(int, pfnEvtWait,(RTIOQUEUEPROV hIoQueueProv, PRTIOQUEUECEVT paCEvt, uint32_t cCEvt,
     213                                        uint32_t cMinWait, uint32_t *pcCEvt, uint32_t fFlags));
    217214
    218215    /**
    … …  
    222219     * @param   hIoQueueProv        The I/O queue provider instance.
    223220     */
    224     DECLCALLBACKMEMBER(int, pfnEvtWaitWakeup) (RTIOQUEUEPROV hIoQueueProv);
     221    DECLCALLBACKMEMBER(int, pfnEvtWaitWakeup,(RTIOQUEUEPROV hIoQueueProv));
    225222
    226223    /** Marks the end of the structure (RTIOQUEUEPROVVTABLE_VERSION). */

  • trunk/include/iprt/ldr.h

    r83084 r85121  
    161161     * @param   off         Where to start reading relative to the start of the raw image.
    162162     */
    163     DECLCALLBACKMEMBER(int, pfnRead)(PRTLDRREADER pReader, void *pvBuf, size_t cb, RTFOFF off);
     163    DECLCALLBACKMEMBER(int, pfnRead,(PRTLDRREADER pReader, void *pvBuf, size_t cb, RTFOFF off));
    164164
    165165    /**
    … …  
    169169     * @param   pReader     Pointer to the reader instance.
    170170     */
    171     DECLCALLBACKMEMBER(RTFOFF, pfnTell)(PRTLDRREADER pReader);
     171    DECLCALLBACKMEMBER(RTFOFF, pfnTell,(PRTLDRREADER pReader));
    172172
    173173    /**
    … …  
    177177     * @param   pReader     Pointer to the reader instance.
    178178     */
    179     DECLCALLBACKMEMBER(uint64_t, pfnSize)(PRTLDRREADER pReader);
     179    DECLCALLBACKMEMBER(uint64_t, pfnSize,(PRTLDRREADER pReader));
    180180
    181181    /**
    … …  
    190190     *                      The size of the mapping can be obtained by calling pfnSize().
    191191     */
    192     DECLCALLBACKMEMBER(int, pfnMap)(PRTLDRREADER pReader, const void **ppvBits);
     192    DECLCALLBACKMEMBER(int, pfnMap,(PRTLDRREADER pReader, const void **ppvBits));
    193193
    194194    /**
    … …  
    199199     * @param   pvBits      Memory pointer returned by pfnMap().
    200200     */
    201     DECLCALLBACKMEMBER(int, pfnUnmap)(PRTLDRREADER pReader, const void *pvBits);
     201    DECLCALLBACKMEMBER(int, pfnUnmap,(PRTLDRREADER pReader, const void *pvBits));
    202202
    203203    /**
    … …  
    207207     * @param   pReader     Pointer to the reader instance.
    208208     */
    209     DECLCALLBACKMEMBER(const char *, pfnLogName)(PRTLDRREADER pReader);
     209    DECLCALLBACKMEMBER(const char *, pfnLogName,(PRTLDRREADER pReader));
    210210
    211211    /**
    … …  
    216216     * @param   pReader     Pointer to the reader instance.
    217217     */
    218     DECLCALLBACKMEMBER(int, pfnDestroy)(PRTLDRREADER pReader);
     218    DECLCALLBACKMEMBER(int, pfnDestroy,(PRTLDRREADER pReader));
    219219} RTLDRREADER;
    220220
    … …  
    511511 * @param   pvUser      The user parameter.
    512512 */
    513 typedef DECLCALLBACK(int) FNRTLDRRDRMEMREAD(void *pvBuf, size_t cb, size_t off, void *pvUser);
     513typedef DECLCALLBACKTYPE(int, FNRTLDRRDRMEMREAD,(void *pvBuf, size_t cb, size_t off, void *pvUser));
    514514/** Pointer to a RTLdrOpenInMemory reader callback. */
    515515typedef FNRTLDRRDRMEMREAD *PFNRTLDRRDRMEMREAD;
    … …  
    523523 * @param   cbImage     The image size.
    524524 */
    525 typedef DECLCALLBACK(void) FNRTLDRRDRMEMDTOR(void *pvUser, size_t cbImage);
     525typedef DECLCALLBACKTYPE(void, FNRTLDRRDRMEMDTOR,(void *pvUser, size_t cbImage));
    526526/** Pointer to a RTLdrOpenInMemory destructor callback. */
    527527typedef FNRTLDRRDRMEMDTOR *PFNRTLDRRDRMEMDTOR;
    … …  
    679679 * @param   pvUser          User argument.
    680680 */
    681 typedef DECLCALLBACK(int) FNRTLDRIMPORT(RTLDRMOD hLdrMod, const char *pszModule, const char *pszSymbol, unsigned uSymbol,
    682                                         PRTLDRADDR pValue, void *pvUser);
     681typedef DECLCALLBACKTYPE(int, FNRTLDRIMPORT,(RTLDRMOD hLdrMod, const char *pszModule, const char *pszSymbol, unsigned uSymbol,
     682                                             PRTLDRADDR pValue, void *pvUser));
    683683/** Pointer to a FNRTLDRIMPORT() callback function. */
    684684typedef FNRTLDRIMPORT *PFNRTLDRIMPORT;
    … …  
    726726 * @param   pvUser          The user argument specified to RTLdrEnumSymbols().
    727727 */
    728 typedef DECLCALLBACK(int) FNRTLDRENUMSYMS(RTLDRMOD hLdrMod, const char *pszSymbol, unsigned uSymbol, RTLDRADDR Value, void *pvUser);
     728typedef DECLCALLBACKTYPE(int, FNRTLDRENUMSYMS,(RTLDRMOD hLdrMod, const char *pszSymbol, unsigned uSymbol, RTLDRADDR Value, void *pvUser));
    729729/** Pointer to a FNRTLDRENUMSYMS() callback function. */
    730730typedef FNRTLDRENUMSYMS *PFNRTLDRENUMSYMS;
    … …  
    897897 * @param   pvUser          The user parameter specified to RTLdrEnumDbgInfo.
    898898 */
    899 typedef DECLCALLBACK(int) FNRTLDRENUMDBG(RTLDRMOD hLdrMod, PCRTLDRDBGINFO pDbgInfo, void *pvUser);
     899typedef DECLCALLBACKTYPE(int, FNRTLDRENUMDBG,(RTLDRMOD hLdrMod, PCRTLDRDBGINFO pDbgInfo, void *pvUser));
    900900/** Pointer to a debug info enumerator callback. */
    901901typedef FNRTLDRENUMDBG *PFNRTLDRENUMDBG;
    … …  
    986986 * @param   pvUser          The user parameter specified to RTLdrEnumSegments.
    987987 */
    988 typedef DECLCALLBACK(int) FNRTLDRENUMSEGS(RTLDRMOD hLdrMod, PCRTLDRSEG pSeg, void *pvUser);
     988typedef DECLCALLBACKTYPE(int, FNRTLDRENUMSEGS,(RTLDRMOD hLdrMod, PCRTLDRSEG pSeg, void *pvUser));
    989989/** Pointer to a segment enumerator callback. */
    990990typedef FNRTLDRENUMSEGS *PFNRTLDRENUMSEGS;
    … …  
    12241224 *
    12251225 */
    1226 typedef DECLCALLBACK(int) FNRTLDRVALIDATESIGNEDDATA(RTLDRMOD hLdrMod, RTLDRSIGNATURETYPE enmSignature,
    1227                                                     void const *pvSignature, size_t cbSignature,
    1228                                                     void const *pvExternalData, size_t cbExternalData,
    1229                                                     PRTERRINFO pErrInfo, void *pvUser);
     1226typedef DECLCALLBACKTYPE(int, FNRTLDRVALIDATESIGNEDDATA,(RTLDRMOD hLdrMod, RTLDRSIGNATURETYPE enmSignature,
     1227                                                         void const *pvSignature, size_t cbSignature,
     1228                                                         void const *pvExternalData, size_t cbExternalData,
     1229                                                         PRTERRINFO pErrInfo, void *pvUser));
    12301230/** Pointer to a signature verification callback. */
    12311231typedef FNRTLDRVALIDATESIGNEDDATA *PFNRTLDRVALIDATESIGNEDDATA;

  • trunk/include/iprt/log.h

    r84054 r85121  
    198198 * @param   ...         Optional arguments as specified in the format string.
    199199 */
    200 typedef DECLCALLBACK(void) FNRTLOGGER(const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(1, 2);
     200typedef DECLCALLBACKTYPE(void, FNRTLOGGER,(const char *pszFormat, ...)) RT_IPRT_FORMAT_ATTR(1, 2);
    201201/** Pointer to logger function. */
    202202typedef FNRTLOGGER *PFNRTLOGGER;
    … …  
    207207 * @param   pLogger     Pointer to the logger instance which is to be flushed.
    208208 */
    209 typedef DECLCALLBACK(void) FNRTLOGFLUSH(PRTLOGGER pLogger);
     209typedef DECLCALLBACKTYPE(void, FNRTLOGFLUSH,(PRTLOGGER pLogger));
    210210/** Pointer to flush function. */
    211211typedef FNRTLOGFLUSH *PFNRTLOGFLUSH;
    … …  
    216216 * @param   pLogger     Pointer to the logger instance which is to be flushed.
    217217 */
    218 typedef DECLCALLBACK(void) FNRTLOGFLUSHGC(PRTLOGGERRC pLogger);
     218typedef DECLCALLBACKTYPE(void, FNRTLOGFLUSHGC,(PRTLOGGERRC pLogger));
    219219/** Pointer to logger function. */
    220220typedef RCPTRTYPE(FNRTLOGFLUSHGC *) PFNRTLOGFLUSHGC;
    … …  
    227227 * @param   ...         Optional arguments specified in the format string.
    228228 */
    229 typedef DECLCALLBACK(void) FNRTLOGPHASEMSG(PRTLOGGER pLogger, const char *pszFormat, ...) RT_IPRT_FORMAT_ATTR(2, 3);
     229typedef DECLCALLBACKTYPE(void, FNRTLOGPHASEMSG,(PRTLOGGER pLogger, const char *pszFormat, ...)) RT_IPRT_FORMAT_ATTR(2, 3);
    230230/** Pointer to header/footer message callback function. */
    231231typedef FNRTLOGPHASEMSG *PFNRTLOGPHASEMSG;
    … …  
    239239 *                          and others are out of bounds).
    240240 */
    241 typedef DECLCALLBACK(void) FNRTLOGPHASE(PRTLOGGER pLogger, RTLOGPHASE enmLogPhase, PFNRTLOGPHASEMSG pfnLogPhaseMsg);
     241typedef DECLCALLBACKTYPE(void, FNRTLOGPHASE,(PRTLOGGER pLogger, RTLOGPHASE enmLogPhase, PFNRTLOGPHASEMSG pfnLogPhaseMsg));
    242242/** Pointer to log header/footer callback function. */
    243243typedef FNRTLOGPHASE *PFNRTLOGPHASE;
    … …  
    255255 * @param   pvUser      The user argument.
    256256 */
    257 typedef DECLCALLBACK(size_t) FNRTLOGPREFIX(PRTLOGGER pLogger, char *pchBuf, size_t cchBuf, void *pvUser);
     257typedef DECLCALLBACKTYPE(size_t, FNRTLOGPREFIX,(PRTLOGGER pLogger, char *pchBuf, size_t cchBuf, void *pvUser));
    258258/** Pointer to prefix callback function. */
    259259typedef FNRTLOGPREFIX *PFNRTLOGPREFIX;
    … …  
    24182418 * @param   cbChars     Number of bytes in the character array pointed to by pachChars.
    24192419 */
    2420 typedef DECLCALLBACK(size_t) FNRTSTROUTPUT(void *pvArg, const char *pachChars, size_t cbChars);
     2420typedef DECLCALLBACKTYPE(size_t, FNRTSTROUTPUT,(void *pvArg, const char *pachChars, size_t cbChars));
    24212421/** Pointer to callback function. */
    24222422typedef FNRTSTROUTPUT *PFNRTSTROUTPUT;

  • trunk/include/iprt/memcache.h

    r82968 r85121  
    7676 * @remarks No serialization is performed.
    7777 */
    78 typedef DECLCALLBACK(int) FNMEMCACHECTOR(RTMEMCACHE hMemCache, void *pvObj, void *pvUser);
     78typedef DECLCALLBACKTYPE(int, FNMEMCACHECTOR,(RTMEMCACHE hMemCache, void *pvObj, void *pvUser));
    7979/** Pointer to an object constructor for the memory cache. */
    8080typedef FNMEMCACHECTOR *PFNMEMCACHECTOR;
    … …  
    9191 * @remarks No serialization is performed.
    9292 */
    93 typedef DECLCALLBACK(void) FNMEMCACHEDTOR(RTMEMCACHE hMemCache, void *pvObj, void *pvUser);
     93typedef DECLCALLBACKTYPE(void, FNMEMCACHEDTOR,(RTMEMCACHE hMemCache, void *pvObj, void *pvUser));
    9494/** Pointer to an object destructor for the memory cache. */
    9595typedef FNMEMCACHEDTOR *PFNMEMCACHEDTOR;

  • trunk/include/iprt/mp.h

    r82968 r85121  
    295295 * @param   pvUser2     The 2nd user argument.
    296296 */
    297 typedef DECLCALLBACK(void) FNRTMPWORKER(RTCPUID idCpu, void *pvUser1, void *pvUser2);
     297typedef DECLCALLBACKTYPE(void, FNRTMPWORKER,(RTCPUID idCpu, void *pvUser1, void *pvUser2));
    298298/** Pointer to a FNRTMPWORKER. */
    299299typedef FNRTMPWORKER *PFNRTMPWORKER;
    … …  
    462462 * @param   pvUser      The user argument.
    463463 */
    464 typedef DECLCALLBACK(void) FNRTMPNOTIFICATION(RTMPEVENT enmEvent, RTCPUID idCpu, void *pvUser);
     464typedef DECLCALLBACKTYPE(void, FNRTMPNOTIFICATION,(RTMPEVENT enmEvent, RTCPUID idCpu, void *pvUser));
    465465/** Pointer to a FNRTMPNOTIFICATION(). */
    466466typedef FNRTMPNOTIFICATION *PFNRTMPNOTIFICATION;

  • trunk/include/iprt/nt/nt.h

    r85088 r85121  
    228228#  pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
    229229#  pragma warning(disable:4471) /* wdm.h(11057) : warning C4471: '_POOL_TYPE' : a forward declaration of an unscoped enumeration must have an underlying type (int assumed) */
     230# endif
     231# if _MSC_VER >= 1900 /*RT_MSC_VER_VC140*/
     232#  ifdef __cplusplus
     233#   pragma warning(disable:5039) /* warning C5039: 'KeInitializeDpc': pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception. */
     234#  endif
    230235# endif
    231236

  • trunk/include/iprt/nt/wdm.h

    r83782 r85121  
    5151# pragma warning(disable:4471) /* wdm.h(11057) : warning C4471: '_POOL_TYPE' : a forward declaration of an unscoped enumeration must have an underlying type (int assumed) */
    5252#endif
     53# if _MSC_VER >= 1900 /*RT_MSC_VER_VC140*/
     54#  ifdef __cplusplus
     55#   pragma warning(disable:5039) /* warning C5039: 'KeInitializeDpc': pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception. */
     56#  endif
     57# endif
    5358#include <wdm.h>
    5459#pragma warning(pop)

  • trunk/include/iprt/once.h

    r82968 r85121  
    5050 * @param   pvUser          The user parameter.
    5151 */
    52 typedef DECLCALLBACK(int32_t) FNRTONCE(void *pvUser);
     52typedef DECLCALLBACKTYPE(int32_t, FNRTONCE,(void *pvUser));
    5353/** Pointer to a FNRTONCE. */
    5454typedef FNRTONCE *PFNRTONCE;
    … …  
    6161 *                          initterm.h).
    6262 */
    63 typedef DECLCALLBACK(void) FNRTONCECLEANUP(void *pvUser, bool fLazyCleanUpOk);
     63typedef DECLCALLBACKTYPE(void, FNRTONCECLEANUP,(void *pvUser, bool fLazyCleanUpOk));
    6464/** Pointer to a FNRTONCE. */
    6565typedef FNRTONCECLEANUP *PFNRTONCECLEANUP;

  • trunk/include/iprt/path.h

    r84509 r85121  
    11311131 * @param   pvUser2         The second user parameter.
    11321132 */
    1133 typedef DECLCALLBACK(int) FNRTPATHTRAVERSER(char const *pchPath, size_t cchPath, void *pvUser1, void *pvUser2);
     1133typedef DECLCALLBACKTYPE(int, FNRTPATHTRAVERSER,(char const *pchPath, size_t cchPath, void *pvUser1, void *pvUser2));
    11341134/** Pointer to a FNRTPATHTRAVERSER. */
    11351135typedef FNRTPATHTRAVERSER *PFNRTPATHTRAVERSER;

  • trunk/include/iprt/power.h

    r82968 r85121  
    6363 * @param   pvUser      The user argument.
    6464 */
    65 typedef DECLCALLBACK(void) FNRTPOWERNOTIFICATION(RTPOWEREVENT enmEvent, void *pvUser);
     65typedef DECLCALLBACKTYPE(void, FNRTPOWERNOTIFICATION,(RTPOWEREVENT enmEvent, void *pvUser));
    6666/** Pointer to a FNRTPOWERNOTIFICATION(). */
    6767typedef FNRTPOWERNOTIFICATION *PFNRTPOWERNOTIFICATION;

  • trunk/include/iprt/s3.h

    r82968 r85121  
    5757 * @param   pvUser      The user parameter given to RTS3SetProgressCallback.
    5858 */
    59 typedef DECLCALLBACK(int) FNRTS3PROGRESS(unsigned uPercent, void *pvUser);
     59typedef DECLCALLBACKTYPE(int, FNRTS3PROGRESS,(unsigned uPercent, void *pvUser));
    6060/** Pointer to a S3 progress callback. */
    6161typedef FNRTS3PROGRESS *PFNRTS3PROGRESS;

  • trunk/include/iprt/sort.h

    r82968 r85121  
    4949 * @param   pvUser          The user argument passed to the sorting function.
    5050 */
    51 typedef DECLCALLBACK(int) FNRTSORTCMP(void const *pvElement1, void const *pvElement2, void *pvUser);
     51typedef DECLCALLBACKTYPE(int, FNRTSORTCMP,(void const *pvElement1, void const *pvElement2, void *pvUser));
    5252/** Pointer to a compare function. */
    5353typedef FNRTSORTCMP *PFNRTSORTCMP;
    … …  
    6262 * @param   pvUser          User argument for the callback.
    6363 */
    64 typedef DECLCALLBACK(void) FNRTSORT(void *pvArray, size_t cElements, size_t cbElement, PFNRTSORTCMP pfnCmp, void *pvUser);
     64typedef DECLCALLBACKTYPE(void, FNRTSORT,(void *pvArray, size_t cElements, size_t cbElement, PFNRTSORTCMP pfnCmp, void *pvUser));
    6565/** Pointer to a sorter function for an array of variable sized elements. */
    6666typedef FNRTSORT *PFNRTSORT;
    … …  
    7474 * @param   pvUser          User argument for the callback.
    7575 */
    76 typedef DECLCALLBACK(void) FNRTSORTAPV(void **papvArray, size_t cElements, PFNRTSORTCMP pfnCmp, void *pvUser);
     76typedef DECLCALLBACKTYPE(void, FNRTSORTAPV,(void **papvArray, size_t cElements, PFNRTSORTCMP pfnCmp, void *pvUser));
    7777/** Pointer to a pointer array sorter function. */
    7878typedef FNRTSORTAPV *PFNRTSORTAPV;

  • trunk/include/iprt/string.h

    r84207 r85121  
    16251625 * @param   cbChars     Number of bytes in the character array pointed to by pachChars.
    16261626 */
    1627 typedef DECLCALLBACK(size_t) FNRTSTROUTPUT(void *pvArg, const char *pachChars, size_t cbChars);
     1627typedef DECLCALLBACKTYPE(size_t, FNRTSTROUTPUT,(void *pvArg, const char *pachChars, size_t cbChars));
    16281628/** Pointer to callback function. */
    16291629typedef FNRTSTROUTPUT *PFNRTSTROUTPUT;
    … …  
    16811681 * @param   chArgSize       The argument size specifier, 'l' or 'L'.
    16821682 */
    1683 typedef DECLCALLBACK(size_t) FNSTRFORMAT(void *pvArg, PFNRTSTROUTPUT pfnOutput, void *pvArgOutput,
    1684                                          const char **ppszFormat, va_list *pArgs, int cchWidth,
    1685                                          int cchPrecision, unsigned fFlags, char chArgSize);
     1683typedef DECLCALLBACKTYPE(size_t, FNSTRFORMAT,(void *pvArg, PFNRTSTROUTPUT pfnOutput, void *pvArgOutput,
     1684                                              const char **ppszFormat, va_list *pArgs, int cchWidth,
     1685                                              int cchPrecision, unsigned fFlags, char chArgSize));
    16861686/** Pointer to a FNSTRFORMAT() function. */
    16871687typedef FNSTRFORMAT *PFNSTRFORMAT;
    … …  
    18991899 * @param   pvUser          The user argument.
    19001900 */
    1901 typedef DECLCALLBACK(size_t) FNRTSTRFORMATTYPE(PFNRTSTROUTPUT pfnOutput, void *pvArgOutput,
    1902                                                const char *pszType, void const *pvValue,
    1903                                                int cchWidth, int cchPrecision, unsigned fFlags,
    1904                                                void *pvUser);
     1901typedef DECLCALLBACKTYPE(size_t, FNRTSTRFORMATTYPE,(PFNRTSTROUTPUT pfnOutput, void *pvArgOutput,
     1902                                                    const char *pszType, void const *pvValue,
     1903                                                    int cchWidth, int cchPrecision, unsigned fFlags,
     1904                                                    void *pvUser));
    19051905/** Pointer to a FNRTSTRFORMATTYPE. */
    19061906typedef FNRTSTRFORMATTYPE *PFNRTSTRFORMATTYPE;
    … …  
    32913291 * @param   pvUser      The user specified argument.
    32923292 */
    3293 typedef DECLCALLBACK(int)   FNRTSTRSPACECALLBACK(PRTSTRSPACECORE pStr, void *pvUser);
     3293typedef DECLCALLBACKTYPE(int, FNRTSTRSPACECALLBACK,(PRTSTRSPACECORE pStr, void *pvUser));
    32943294/** Pointer to callback function for RTStrSpaceEnumerate() and RTStrSpaceDestroy(). */
    32953295typedef FNRTSTRSPACECALLBACK *PFNRTSTRSPACECALLBACK;

  • trunk/include/iprt/table.h

    r82968 r85121  
    5050 * @param   cb          The number of bytes to allocate. (Never 0.)
    5151 */
    52 typedef DECLCALLBACK(void *) FNRTTABALLOC(PRTTABALLOCATOR pAllocator, size_t cb);
     52typedef DECLCALLBACKTYPE(void *, FNRTTABALLOC,(PRTTABALLOCATOR pAllocator, size_t cb));
    5353/** Pointer to a FNRTTABALLOC() function. */
    5454typedef FNRTTABALLOC *PFNRTTABALLOC;
    … …  
    6060 * @param   pv          The memory to free. (can be NULL)
    6161 */
    62 typedef DECLCALLBACK(void *) FNRTTABFREE(PRTTABALLOCATOR pAllocator, void *pv);
     62typedef DECLCALLBACKTYPE(void *, FNRTTABFREE,(PRTTABALLOCATOR pAllocator, void *pv));
    6363/** Pointer to a FNRTTABFREE() function. */
    6464typedef FNRTTABFREE *PFNRTTABFREE;
    … …  
    9595 * @param   pvUser      The user argument.
    9696 */
    97 typedef DECLCALLBACK(int) FNRTTABCOMP(const void *pvItem1, const void *pvItem2, void *pvUser);
     97typedef DECLCALLBACKTYPE(int, FNRTTABCOMP,(const void *pvItem1, const void *pvItem2, void *pvUser));
    9898/** Pointer to a FNRTTABCOMP() function. */
    9999typedef FNRTTABCOMP *PFNRTTABCOMP;
    … …  
    109109 * @param   pvUser      The user argument.
    110110 */
    111 typedef DECLCALLBACK(void *) FNRTTABDUPLICATE(const void *pvItem, void *pvUser);
     111typedef DECLCALLBACKTYPE(void *, FNRTTABDUPLICATE,(const void *pvItem, void *pvUser));
    112112/** Pointer to a FNRTTABDUPLICATE() function. */
    113113typedef FNRTTABDUPLICATE *PFNRTTABDUPLICATE;
    … …  
    121121 * @param   pvUser      The user argument.
    122122 */
    123 typedef DECLCALLBACK(void) FNRTTABCALLBACK(const void *pvItem, void *pvUser);
     123typedef DECLCALLBACKTYPE(void, FNRTTABCALLBACK,(const void *pvItem, void *pvUser));
    124124/** Pointer to a FNRTTABCALLBACK() function. */
    125125typedef FNRTTABCALLBACK *PFNRTTABCALLBACK;
    … …  
    157157     * @param   pfnComp         The comparision function.
    158158     */
    159     DECLCALLBACKMEMBER(PRTTAB, pfnCreate)(PCRTTABOPS pOps, unsigned fCreateFlags, PRTTABALLOCATOR pAllocator, PFNRTTABCOMP pfnComp);
     159    DECLCALLBACKMEMBER(PRTTAB, pfnCreate,(PCRTTABOPS pOps, unsigned fCreateFlags, PRTTABALLOCATOR pAllocator, PFNRTTABCOMP pfnComp));
    160160
    161161    /**
    … …  
    170170     * @param   pAllocator      Custom allocator. Pass NULL to use the same allocator as pTab.
    171171     */
    172     DECLCALLBACKMEMBER(PRTTAB, pfnDuplicate)(PCRTTAB pTab, PFNRTTABDUPLICATE pfnDuplicate, PFNRTTABCALLBACK pfnNewCB, PRTTABALLOCATOR pAllocator);
     172    DECLCALLBACKMEMBER(PRTTAB, pfnDuplicate,(PCRTTAB pTab, PFNRTTABDUPLICATE pfnDuplicate, PFNRTTABCALLBACK pfnNewCB, PRTTABALLOCATOR pAllocator));
    173173
    174174    /**
    … …  
    177177     * @param   pTab        The table to destroy.
    178178     */
    179     DECLCALLBACKMEMBER(void, pfnDestroy)(PRTTAB pTab);
     179    DECLCALLBACKMEMBER(void, pfnDestroy,(PRTTAB pTab));
    180180
    181181    /**
    … …  
    189189     * @param   pvItem          The item which will be inserted if an matching item was not found in the table.
    190190     */
    191     DECLCALLBACKMEMBER(void **, pfnProbe)(PRTTAB pTab, void *pvItem);
     191    DECLCALLBACKMEMBER(void **, pfnProbe,(PRTTAB pTab, void *pvItem));
    192192
    193193    /**
    … …  
    199199     * @param   pvItem          The item which is to be inserted.
    200200     */
    201     DECLCALLBACKMEMBER(void *, pfnInsert)(PRTTAB pTab, void *pvItem);
     201    DECLCALLBACKMEMBER(void *, pfnInsert,(PRTTAB pTab, void *pvItem));
    202202
    203203    /**
    … …  
    210210     * @param   pvItem          The item which is to be inserted.
    211211     */
    212     DECLCALLBACKMEMBER(void *, pfnReplace)(PRTTAB pTab, void *pvItem);
     212    DECLCALLBACKMEMBER(void *, pfnReplace,(PRTTAB pTab, void *pvItem));
    213213
    214214    /**
    … …  
    220220     * @param   pvItem          The item which is to be inserted.
    221221     */
    222     DECLCALLBACKMEMBER(void *, pfnRemove)(PRTTAB pTab, const void *pvItem);
     222    DECLCALLBACKMEMBER(void *, pfnRemove,(PRTTAB pTab, const void *pvItem));
    223223
    224224    /**
    … …  
    230230     * @param   pvItem          The item which is to be inserted.
    231231     */
    232     DECLCALLBACKMEMBER(void *, pfnFind)(PRTTAB pTab, const void *pvItem);
     232    DECLCALLBACKMEMBER(void *, pfnFind,(PRTTAB pTab, const void *pvItem));
    233233
    234234    /**
    … …  
    244244     * @param   pTravNew        Pointer to a preallocated structure. Optional.
    245245     */
    246     DECLCALLBACKMEMBER(PRTTABTRAVERSERCORE, pfnTravInit)(PRTTAB pTab, PRTTABTRAVERSER pTravNew);
     246    DECLCALLBACKMEMBER(PRTTABTRAVERSERCORE, pfnTravInit,(PRTTAB pTab, PRTTABTRAVERSER pTravNew));
    247247
    248248    /**
    … …  
    258258     * @param   pTravNew        Pointer to a preallocated structure. Optional.
    259259     */
    260     DECLCALLBACKMEMBER(PRTTABTRAVERSERCORE, pfnTravFirst)(PRTTAB pTab, PRTTABTRAVERSER pTravNew);
     260    DECLCALLBACKMEMBER(PRTTABTRAVERSERCORE, pfnTravFirst,(PRTTAB pTab, PRTTABTRAVERSER pTravNew));
    261261
    262262    /**
    … …  
    272272     * @param   pTravNew        Pointer to a preallocated structure. Optional.
    273273     */
    274     DECLCALLBACKMEMBER(PRTTABTRAVERSERCORE, pfnTravLast)(PRTTAB pTab, PRTTABTRAVERSER pTravNew);
     274    DECLCALLBACKMEMBER(PRTTABTRAVERSERCORE, pfnTravLast,(PRTTAB pTab, PRTTABTRAVERSER pTravNew));
    275275
    276276    /**
    … …  
    287287     * @param   pvItem          The item to find the match to.
    288288     */
    289     DECLCALLBACKMEMBER(PRTTABTRAVERSERCORE, pfnTravFind)(PRTTAB pTab, PRTTABTRAVERSER pTravNew, const void *pvItem);
     289    DECLCALLBACKMEMBER(PRTTABTRAVERSERCORE, pfnTravFind,(PRTTAB pTab, PRTTABTRAVERSER pTravNew, const void *pvItem));
    290290
    291291    /**
    … …  
    305305     * @param   pvItem          The item to be inserted.
    306306     */
    307     DECLCALLBACKMEMBER(PRTTABTRAVERSERCORE, pfnTravInsert)(PRTTAB pTab, PRTTABTRAVERSER pTravNew, void *pvItem);
     307    DECLCALLBACKMEMBER(PRTTABTRAVERSERCORE, pfnTravInsert,(PRTTAB pTab, PRTTABTRAVERSER pTravNew, void *pvItem));
    308308
    309309    /**
    … …  
    316316     * @param   pTravNew        Pointer to a preallocated structure. Optional.
    317317     */
    318     DECLCALLBACKMEMBER(PRTTABTRAVERSERCORE, pfnTravDuplicate)(PRTTABTRAVERSERCORE pTrav, PCRTTABTRAVERSER pTravNew);
     318    DECLCALLBACKMEMBER(PRTTABTRAVERSERCORE, pfnTravDuplicate,(PRTTABTRAVERSERCORE pTrav, PCRTTABTRAVERSER pTravNew));
    319319
    320320    /**
    … …  
    326326     * @param   pTrav           The traverser which is to be free.
    327327     */
    328     DECLCALLBACKMEMBER(void, pfnTravFree)(PRTTABTRAVERSERCORE pTrav);
     328    DECLCALLBACKMEMBER(void, pfnTravFree,(PRTTABTRAVERSERCORE pTrav));
    329329
    330330    /**
    … …  
    334334     * @param   pTrav           The traverser.
    335335     */
    336     DECLCALLBACKMEMBER(void *, pfnTravCur)(PCRTTABTRAVERSERCORE pTrav);
     336    DECLCALLBACKMEMBER(void *, pfnTravCur,(PCRTTABTRAVERSERCORE pTrav));
    337337
    338338    /**
    … …  
    342342     * @param   pTrav           The traverser.
    343343     */
    344     DECLCALLBACKMEMBER(void *, pfnTravNext)(PRTTABTRAVERSERCORE pTrav);
     344    DECLCALLBACKMEMBER(void *, pfnTravNext,(PRTTABTRAVERSERCORE pTrav));
    345345
    346346    /**
    … …  
    350350     * @param   pTrav           The traverser.
    351351     */
    352     DECLCALLBACKMEMBER(void *, pfnTravPrev)(PRTTABTRAVERSERCORE pTrav);
     352    DECLCALLBACKMEMBER(void *, pfnTravPrev,(PRTTABTRAVERSERCORE pTrav));
    353353
    354354    /**
    … …  
    364364     * @param   pvItem          The item to be inserted.
    365365     */
    366     DECLCALLBACKMEMBER(void *, pfnTravReplace)(PRTTABTRAVERSERCORE pTrav, void *pvItem);
     366    DECLCALLBACKMEMBER(void *, pfnTravReplace,(PRTTABTRAVERSERCORE pTrav, void *pvItem));
    367367
    368368    /** The type of table type. */

  • trunk/include/iprt/tcp.h

    r82968 r85121  
    6060 * @param   pvUser      User argument.
    6161 */
    62 typedef DECLCALLBACK(int) FNRTTCPSERVE(RTSOCKET hSocket, void *pvUser);
     62typedef DECLCALLBACKTYPE(int, FNRTTCPSERVE,(RTSOCKET hSocket, void *pvUser));
    6363/** Pointer to a RTTCPSERVE(). */
    6464typedef FNRTTCPSERVE *PFNRTTCPSERVE;

  • trunk/include/iprt/thread.h

    r83124 r85121  
    238238 * @param   pvUser      User argument.
    239239 */
    240 typedef DECLCALLBACK(int) FNRTTHREAD(RTTHREAD ThreadSelf, void *pvUser);
     240typedef DECLCALLBACKTYPE(int, FNRTTHREAD,(RTTHREAD ThreadSelf, void *pvUser));
    241241/** Pointer to a FNRTTHREAD(). */
    242242typedef FNRTTHREAD *PFNRTTHREAD;
    … …  
    281281#ifndef RT_OS_LINUX /* XXX crashes genksyms at least on 32-bit Linux hosts */
    282282/** Pointer to a RTThreadCreate function. */
    283 typedef DECLCALLBACKPTR(int, PFNRTTHREADCREATE)(PRTTHREAD pThread, PFNRTTHREAD pfnThread, void *pvUser, size_t cbStack,
    284                                                 RTTHREADTYPE enmType, unsigned fFlags, const char *pszName);
     283typedef DECLCALLBACKPTR(int, PFNRTTHREADCREATE,(PRTTHREAD pThread, PFNRTTHREAD pfnThread, void *pvUser, size_t cbStack,
     284                                                RTTHREADTYPE enmType, unsigned fFlags, const char *pszName));
    285285#endif
    286286
    … …  
    645645 * @param   pvUser      User argument.
    646646 */
    647 typedef DECLCALLBACK(void) FNRTTHREADCTXHOOK(RTTHREADCTXEVENT enmEvent, void *pvUser);
     647typedef DECLCALLBACKTYPE(void, FNRTTHREADCTXHOOK,(RTTHREADCTXEVENT enmEvent, void *pvUser));
    648648/** Pointer to a context switching hook. */
    649649typedef FNRTTHREADCTXHOOK *PFNRTTHREADCTXHOOK;
    … …  
    873873 * @param   pvValue     The current value.
    874874 */
    875 typedef DECLCALLBACK(void) FNRTTLSDTOR(void *pvValue);
     875typedef DECLCALLBACKTYPE(void, FNRTTLSDTOR,(void *pvValue));
    876876/** Pointer to a FNRTTLSDTOR. */
    877877typedef FNRTTLSDTOR *PFNRTTLSDTOR;

  • trunk/include/iprt/time.h

    r83484 r85121  
    977977     * @param   u64PrevNanoTS   The previously returned timestamp (as it was read it).
    978978     */
    979     DECLCALLBACKMEMBER(void, pfnBad)(PRTTIMENANOTSDATA pData, uint64_t u64NanoTS, uint64_t u64DeltaPrev, uint64_t u64PrevNanoTS);
     979    DECLCALLBACKMEMBER(void, pfnBad,(PRTTIMENANOTSDATA pData, uint64_t u64NanoTS, uint64_t u64DeltaPrev, uint64_t u64PrevNanoTS));
    980980
    981981    /**
    … …  
    985985     * @param   pData           Pointer to this structure.
    986986     */
    987     DECLCALLBACKMEMBER(uint64_t, pfnRediscover)(PRTTIMENANOTSDATA pData);
     987    DECLCALLBACKMEMBER(uint64_t, pfnRediscover,(PRTTIMENANOTSDATA pData));
    988988
    989989    /**
    … …  
    998998     *                          (UINT16_MAX-1).
    999999     */
    1000     DECLCALLBACKMEMBER(uint64_t, pfnBadCpuIndex)(PRTTIMENANOTSDATA pData, uint16_t idApic, uint16_t iCpuSet, uint16_t iGipCpu);
     1000    DECLCALLBACKMEMBER(uint64_t, pfnBadCpuIndex,(PRTTIMENANOTSDATA pData, uint16_t idApic, uint16_t iCpuSet, uint16_t iGipCpu));
    10011001
    10021002    /** Number of 1ns steps because of overshooting the period. */
    … …  
    10681068
    10691069/** Internal RTTimeNanoTS worker (assembly). */
    1070 typedef DECLCALLBACK(uint64_t) FNTIMENANOTSINTERNAL(PRTTIMENANOTSDATA pData);
     1070typedef DECLCALLBACKTYPE(uint64_t, FNTIMENANOTSINTERNAL,(PRTTIMENANOTSDATA pData));
    10711071/** Pointer to an internal RTTimeNanoTS worker (assembly). */
    10721072typedef FNTIMENANOTSINTERNAL *PFNTIMENANOTSINTERNAL;

  • trunk/include/iprt/timer.h

    r82968 r85121  
    8181 *                      this will be 1 when a cpu comes back online.
    8282 */
    83 typedef DECLCALLBACK(void) FNRTTIMER(PRTTIMER pTimer, void *pvUser, uint64_t iTick);
     83typedef DECLCALLBACKTYPE(void, FNRTTIMER,(PRTTIMER pTimer, void *pvUser, uint64_t iTick));
    8484/** Pointer to FNRTTIMER() function. */
    8585typedef FNRTTIMER *PFNRTTIMER;
    … …  
    290290 *                      skipped ticks when lagging behind.
    291291 */
    292 typedef DECLCALLBACK(void) FNRTTIMERLR(RTTIMERLR hTimerLR, void *pvUser, uint64_t iTick);
     292typedef DECLCALLBACKTYPE(void, FNRTTIMERLR,(RTTIMERLR hTimerLR, void *pvUser, uint64_t iTick));
    293293/** Pointer to FNRTTIMER() function. */
    294294typedef FNRTTIMERLR *PFNRTTIMERLR;

  • trunk/include/iprt/trace.h

    r82968 r85121  
    111111 * @param   pvUser              The user argument.
    112112 */
    113 typedef DECLCALLBACK(int) FNRTTRACEBUFCALLBACK(RTTRACEBUF hTraceBuf, uint32_t iEntry, uint64_t NanoTS,
    114                                                RTCPUID idCpu, const char *pszMsg, void *pvUser);
     113typedef DECLCALLBACKTYPE(int, FNRTTRACEBUFCALLBACK,(RTTRACEBUF hTraceBuf, uint32_t iEntry, uint64_t NanoTS,
     114                                                    RTCPUID idCpu, const char *pszMsg, void *pvUser));
    115115/** Pointer to trace buffer enumeration callback function. */
    116116typedef FNRTTRACEBUFCALLBACK *PFNRTTRACEBUFCALLBACK;

  • trunk/include/iprt/tracelog.h

    r82968 r85121  
    261261 * @param   pcbWritten          Where to store the number of bytes written on success, optional.
    262262 */
    263 typedef DECLCALLBACK(int) FNRTTRACELOGWRSTREAM(void *pvUser, const void *pvBuf, size_t cbBuf, size_t *pcbWritten);
     263typedef DECLCALLBACKTYPE(int, FNRTTRACELOGWRSTREAM,(void *pvUser, const void *pvBuf, size_t cbBuf, size_t *pcbWritten));
    264264/** Pointer to a writer stream callback. */
    265265typedef FNRTTRACELOGWRSTREAM *PFNRTTRACELOGWRSTREAM;
    … …  
    279279 * @param   cMsTimeout          How long to wait for something to arrive
    280280 */
    281 typedef DECLCALLBACK(int) FNRTTRACELOGRDRSTREAM(void *pvUser, void *pvBuf, size_t cbBuf, size_t *pcbRead,
    282                                                 RTMSINTERVAL cMsTimeout);
     281typedef DECLCALLBACKTYPE(int, FNRTTRACELOGRDRSTREAM,(void *pvUser, void *pvBuf, size_t cbBuf, size_t *pcbRead,
     282                                                     RTMSINTERVAL cMsTimeout));
    283283/** Pointer to a writer stream callback. */
    284284typedef FNRTTRACELOGRDRSTREAM *PFNRTTRACELOGRDRSTREAM;
    … …  
    291291 * @param   pvUser              Opaque user data passed on trace log writer creation.
    292292 */
    293 typedef DECLCALLBACK(int) FNRTTRACELOGSTREAMCLOSE(void *pvUser);
     293typedef DECLCALLBACKTYPE(int, FNRTTRACELOGSTREAMCLOSE,(void *pvUser));
    294294/** Pointer to a stream close callback. */
    295295typedef FNRTTRACELOGSTREAMCLOSE *PFNRTTRACELOGSTREAMCLOSE;

  • trunk/include/iprt/types.h

    r84407 r85121  
    11271127 * @see PFNRT
    11281128 */
    1129 typedef DECLCALLBACK(void) FNRT(void);
     1129typedef DECLCALLBACKTYPE(void, FNRT,(void));
    11301130
    11311131/** Generic function pointer.
    … …  
    11471147 */
    11481148typedef FNRT *PFNRT;
     1149
     1150/** Variant on PFNRT that takes one pointer argument. */
     1151typedef DECLCALLBACKTYPE(void, FNRT1,(void *pvArg));
     1152/** Pointer to FNRT1. */
     1153typedef FNRT1 *PFNRT1;
    11491154
    11501155/** Millisecond interval. */
    … …  
    27982803 * @param   pvUser          The user specified argument.
    27992804 */
    2800 typedef DECLCALLBACK(int) FNRTPROGRESS(unsigned uPrecentage, void *pvUser);
     2805typedef DECLCALLBACKTYPE(int, FNRTPROGRESS,(unsigned uPrecentage, void *pvUser));
    28012806/** Pointer to a generic progress callback function, FNRTPROCESS(). */
    28022807typedef FNRTPROGRESS *PFNRTPROGRESS;
    … …  
    28092814 * @param   va              Arguments for the format string.
    28102815 */
    2811 typedef DECLCALLBACK(void) FNRTDUMPPRINTFV(void *pvUser, const char *pszFormat, va_list va) RT_IPRT_FORMAT_ATTR(2, 0);
     2816typedef DECLCALLBACKTYPE(void, FNRTDUMPPRINTFV,(void *pvUser, const char *pszFormat, va_list va) RT_IPRT_FORMAT_ATTR(2, 0));
    28122817/** Pointer to a generic printf-like function for dumping. */
    28132818typedef FNRTDUMPPRINTFV *PFNRTDUMPPRINTFV;

  • trunk/include/iprt/udp.h

    r82968 r85121  
    5959 * @param   pvUser      User argument.
    6060 */
    61 typedef DECLCALLBACK(int) FNRTUDPSERVE(RTSOCKET Sock, void *pvUser);
     61typedef DECLCALLBACKTYPE(int, FNRTUDPSERVE,(RTSOCKET Sock, void *pvUser));
    6262/** Pointer to a RTUDPSERVE(). */
    6363typedef FNRTUDPSERVE *PFNRTUDPSERVE;

  • trunk/include/iprt/vfslowlevel.h

    r84194 r85121  
    180180     * @param   pvThis      The implementation specific file data.
    181181     */
    182     DECLCALLBACKMEMBER(int, pfnClose)(void *pvThis);
     182    DECLCALLBACKMEMBER(int, pfnClose,(void *pvThis));
    183183
    184184    /**
    … …  
    192192     * @sa      RTVfsObjQueryInfo, RTFileQueryInfo, RTPathQueryInfo
    193193     */
    194     DECLCALLBACKMEMBER(int, pfnQueryInfo)(void *pvThis, PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAddAttr);
     194    DECLCALLBACKMEMBER(int, pfnQueryInfo,(void *pvThis, PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAddAttr));
    195195
    196196    /** Marks the end of the structure (RTVFSOBJOPS_VERSION). */
    … …  
    223223     * @param   phVfsDir    Where to return the handle to the root directory.
    224224     */
    225     DECLCALLBACKMEMBER(int, pfnOpenRoot)(void *pvThis, PRTVFSDIR phVfsDir);
     225    DECLCALLBACKMEMBER(int, pfnOpenRoot,(void *pvThis, PRTVFSDIR phVfsDir));
    226226
    227227    /**
    … …  
    237237     * @param   pfUsed      Where to store whether the given range is in use.
    238238     */
    239     DECLCALLBACKMEMBER(int, pfnQueryRangeState)(void *pvThis, uint64_t off, size_t cb, bool *pfUsed);
     239    DECLCALLBACKMEMBER(int, pfnQueryRangeState,(void *pvThis, uint64_t off, size_t cb, bool *pfUsed));
    240240
    241241    /** @todo There will be more methods here to optimize opening and
    … …  
    254254     * @param   p???        Return other stuff...
    255255     */
    256     DECLCALLBACKMEMBER(int, pfnTraverse)(void *pvThis, const char *pszPath, size_t *poffPath, PRTVFS??? phVfs?, ???* p???);
     256    DECLCALLBACKMEMBER(int, pfnTraverse,(void *pvThis, const char *pszPath, size_t *poffPath, PRTVFS??? phVfs?, ???* p???));
    257257#endif
    258258
    … …  
    344344     * @sa      RTFileSetMode
    345345     */
    346     DECLCALLBACKMEMBER(int, pfnSetMode)(void *pvThis, RTFMODE fMode, RTFMODE fMask);
     346    DECLCALLBACKMEMBER(int, pfnSetMode,(void *pvThis, RTFMODE fMode, RTFMODE fMask));
    347347
    348348    /**
    … …  
    364364     * @sa      RTFileSetTimes
    365365     */
    366     DECLCALLBACKMEMBER(int, pfnSetTimes)(void *pvThis, PCRTTIMESPEC pAccessTime, PCRTTIMESPEC pModificationTime,
    367                                          PCRTTIMESPEC pChangeTime, PCRTTIMESPEC pBirthTime);
     366    DECLCALLBACKMEMBER(int, pfnSetTimes,(void *pvThis, PCRTTIMESPEC pAccessTime, PCRTTIMESPEC pModificationTime,
     367                                         PCRTTIMESPEC pChangeTime, PCRTTIMESPEC pBirthTime));
    368368
    369369    /**
    … …  
    379379     * @sa      RTFileSetOwner
    380380     */
    381     DECLCALLBACKMEMBER(int, pfnSetOwner)(void *pvThis, RTUID uid, RTGID gid);
     381    DECLCALLBACKMEMBER(int, pfnSetOwner,(void *pvThis, RTUID uid, RTGID gid));
    382382
    383383    /** Marks the end of the structure (RTVFSOBJSETOPS_VERSION). */
    … …  
    423423     * @note    Setting this member to NULL is okay for write-only streams.
    424424     */
    425     DECLCALLBACKMEMBER(int, pfnNext)(void *pvThis, char **ppszName, RTVFSOBJTYPE *penmType, PRTVFSOBJ phVfsObj);
     425    DECLCALLBACKMEMBER(int, pfnNext,(void *pvThis, char **ppszName, RTVFSOBJTYPE *penmType, PRTVFSOBJ phVfsObj));
    426426
    427427    /**
    … …  
    439439     * @note    Setting this member to NULL is okay for read-only streams.
    440440     */
    441     DECLCALLBACKMEMBER(int, pfnAdd)(void *pvThis, const char *pszPath, RTVFSOBJ hVfsObj, uint32_t fFlags);
     441    DECLCALLBACKMEMBER(int, pfnAdd,(void *pvThis, const char *pszPath, RTVFSOBJ hVfsObj, uint32_t fFlags));
    442442
    443443    /**
    … …  
    467467     *                      handle can be cast to a file if necessary.
    468468     */
    469     DECLCALLBACKMEMBER(int, pfnPushFile)(void *pvThis, const char *pszPath, uint64_t cbFile,
    470                                          PCRTFSOBJINFO paObjInfo, uint32_t cObjInfo, uint32_t fFlags, PRTVFSIOSTREAM phVfsIos);
     469    DECLCALLBACKMEMBER(int, pfnPushFile,(void *pvThis, const char *pszPath, uint64_t cbFile,
     470                                         PCRTFSOBJINFO paObjInfo, uint32_t cObjInfo, uint32_t fFlags, PRTVFSIOSTREAM phVfsIos));
    471471
    472472    /**
    … …  
    481481     * @note    Setting this member to NULL is okay for read-only streams.
    482482     */
    483     DECLCALLBACKMEMBER(int, pfnEnd)(void *pvThis);
     483    DECLCALLBACKMEMBER(int, pfnEnd,(void *pvThis));
    484484
    485485    /** Marks the end of the structure (RTVFSFSSTREAMOPS_VERSION). */
    … …  
    577577     * @sa      RTFileOpen, RTDirOpen
    578578     */
    579     DECLCALLBACKMEMBER(int, pfnOpen)(void *pvThis, const char *pszEntry, uint64_t fOpenFile,
    580                                      uint32_t fObjFlags, PRTVFSOBJ phVfsObj);
     579    DECLCALLBACKMEMBER(int, pfnOpen,(void *pvThis, const char *pszEntry, uint64_t fOpenFile,
     580                                     uint32_t fObjFlags, PRTVFSOBJ phVfsObj));
    581581
    582582    /**
    … …  
    596596     *                      directory (or may current dir on a drive letter).
    597597     */
    598     DECLCALLBACKMEMBER(int, pfnFollowAbsoluteSymlink)(void *pvThis, const char *pszRoot, PRTVFSDIR phVfsDir);
     598    DECLCALLBACKMEMBER(int, pfnFollowAbsoluteSymlink,(void *pvThis, const char *pszRoot, PRTVFSDIR phVfsDir));
    599599
    600600    /**
    … …  
    609609     * @sa      RTFileOpen.
    610610     */
    611     DECLCALLBACKMEMBER(int, pfnOpenFile)(void *pvThis, const char *pszFilename, uint64_t fOpen, PRTVFSFILE phVfsFile);
     611    DECLCALLBACKMEMBER(int, pfnOpenFile,(void *pvThis, const char *pszFilename, uint64_t fOpen, PRTVFSFILE phVfsFile));
    612612
    613613    /**
    … …  
    626626     * @sa      RTDirOpen.
    627627     */
    628     DECLCALLBACKMEMBER(int, pfnOpenDir)(void *pvThis, const char *pszSubDir, uint32_t fFlags, PRTVFSDIR phVfsDir);
     628    DECLCALLBACKMEMBER(int, pfnOpenDir,(void *pvThis, const char *pszSubDir, uint32_t fFlags, PRTVFSDIR phVfsDir));
    629629
    630630    /**
    … …  
    640640     * @sa      RTDirCreate.
    641641     */
    642     DECLCALLBACKMEMBER(int, pfnCreateDir)(void *pvThis, const char *pszSubDir, RTFMODE fMode, PRTVFSDIR phVfsDir);
     642    DECLCALLBACKMEMBER(int, pfnCreateDir,(void *pvThis, const char *pszSubDir, RTFMODE fMode, PRTVFSDIR phVfsDir));
    643643
    644644    /**
    … …  
    653653     * @sa      RTSymlinkCreate.
    654654     */
    655     DECLCALLBACKMEMBER(int, pfnOpenSymlink)(void *pvThis, const char *pszSymlink, PRTVFSSYMLINK phVfsSymlink);
     655    DECLCALLBACKMEMBER(int, pfnOpenSymlink,(void *pvThis, const char *pszSymlink, PRTVFSSYMLINK phVfsSymlink));
    656656
    657657    /**
    … …  
    667667     * @sa      RTSymlinkCreate.
    668668     */
    669     DECLCALLBACKMEMBER(int, pfnCreateSymlink)(void *pvThis, const char *pszSymlink, const char *pszTarget,
    670                                               RTSYMLINKTYPE enmType, PRTVFSSYMLINK phVfsSymlink);
     669    DECLCALLBACKMEMBER(int, pfnCreateSymlink,(void *pvThis, const char *pszSymlink, const char *pszTarget,
     670                                              RTSYMLINKTYPE enmType, PRTVFSSYMLINK phVfsSymlink));
    671671
    672672    /**
    … …  
    682682     * @sa      RTPathQueryInfo, RTVFSOBJOPS::pfnQueryInfo
    683683     */
    684     DECLCALLBACKMEMBER(int, pfnQueryEntryInfo)(void *pvThis, const char *pszEntry,
    685                                                PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAddAttr);
     684    DECLCALLBACKMEMBER(int, pfnQueryEntryInfo,(void *pvThis, const char *pszEntry,
     685                                               PRTFSOBJINFO pObjInfo, RTFSOBJATTRADD enmAddAttr));
    686686
    687687    /**
    … …  
    696696     * @sa      RTFileRemove, RTDirRemove, RTSymlinkRemove.
    697697     */
    698     DECLCALLBACKMEMBER(int, pfnUnlinkEntry)(void *pvThis, const char *pszEntry, RTFMODE fType);
     698    DECLCALLBACKMEMBER(int, pfnUnlinkEntry,(void *pvThis, const char *pszEntry, RTFMODE fType));
    699699
    700700    /**
    … …  
    713713     *          directories within a file system.
    714714     */
    715     DECLCALLBACKMEMBER(int, pfnRenameEntry)(void *pvThis, const char *pszEntry, RTFMODE fType, const char *pszNewName);
     715    DECLCALLBACKMEMBER(int, pfnRenameEntry,(void *pvThis, const char *pszEntry, RTFMODE fType, const char *pszNewName));
    716716
    717717    /**
    … …  
    722722     * @param   pvThis      The implementation specific directory data.
    723723     */
    724     DECLCALLBACKMEMBER(int, pfnRewindDir)(void *pvThis);
     724    DECLCALLBACKMEMBER(int, pfnRewindDir,(void *pvThis));
    725725
    726726    /**
    … …  
    735735     * @sa      RTDirReadEx
    736736     */
    737     DECLCALLBACKMEMBER(int, pfnReadDir)(void *pvThis, PRTDIRENTRYEX pDirEntry, size_t *pcbDirEntry, RTFSOBJATTRADD enmAddAttr);
     737    DECLCALLBACKMEMBER(int, pfnReadDir,(void *pvThis, PRTDIRENTRYEX pDirEntry, size_t *pcbDirEntry, RTFSOBJATTRADD enmAddAttr));
    738738
    739739    /** Marks the end of the structure (RTVFSDIROPS_VERSION). */
    … …  
    810810     * @sa      RTSymlinkRead
    811811     */
    812     DECLCALLBACKMEMBER(int, pfnRead)(void *pvThis, char *pszTarget, size_t cbTarget);
     812    DECLCALLBACKMEMBER(int, pfnRead,(void *pvThis, char *pszTarget, size_t cbTarget));
    813813
    814814    /** Marks the end of the structure (RTVFSSYMLINKOPS_VERSION). */
    … …  
    881881     *          RTVfsFileReadAt, RTFileRead, RTFileReadAt.
    882882     */
    883     DECLCALLBACKMEMBER(int, pfnRead)(void *pvThis, RTFOFF off, PCRTSGBUF pSgBuf, bool fBlocking, size_t *pcbRead);
     883    DECLCALLBACKMEMBER(int, pfnRead,(void *pvThis, RTFOFF off, PCRTSGBUF pSgBuf, bool fBlocking, size_t *pcbRead));
    884884
    885885    /**
    … …  
    900900     * @sa      RTFileWrite, RTFileWriteAt.
    901901     */
    902     DECLCALLBACKMEMBER(int, pfnWrite)(void *pvThis, RTFOFF off, PCRTSGBUF pSgBuf, bool fBlocking, size_t *pcbWritten);
     902    DECLCALLBACKMEMBER(int, pfnWrite,(void *pvThis, RTFOFF off, PCRTSGBUF pSgBuf, bool fBlocking, size_t *pcbWritten));
    903903
    904904    /**
    … …  
    909909     * @sa      RTFileFlush.
    910910     */
    911     DECLCALLBACKMEMBER(int, pfnFlush)(void *pvThis);
     911    DECLCALLBACKMEMBER(int, pfnFlush,(void *pvThis));
    912912
    913913    /**
    … …  
    926926     * @sa      RTPollSetAdd, RTPoll, RTPollNoResume.
    927927     */
    928     DECLCALLBACKMEMBER(int, pfnPollOne)(void *pvThis, uint32_t fEvents, RTMSINTERVAL cMillies, bool fIntr,
    929                                         uint32_t *pfRetEvents);
     928    DECLCALLBACKMEMBER(int, pfnPollOne,(void *pvThis, uint32_t fEvents, RTMSINTERVAL cMillies, bool fIntr,
     929                                        uint32_t *pfRetEvents));
    930930
    931931    /**
    … …  
    937937     * @sa      RTFileTell
    938938     */
    939     DECLCALLBACKMEMBER(int, pfnTell)(void *pvThis, PRTFOFF poffActual);
     939    DECLCALLBACKMEMBER(int, pfnTell,(void *pvThis, PRTFOFF poffActual));
    940940
    941941    /**
    … …  
    947947     * @remarks This is optional and can be NULL.
    948948     */
    949     DECLCALLBACKMEMBER(int, pfnSkip)(void *pvThis, RTFOFF cb);
     949    DECLCALLBACKMEMBER(int, pfnSkip,(void *pvThis, RTFOFF cb));
    950950
    951951    /**
    … …  
    957957     * @remarks This is optional and can be NULL.
    958958     */
    959     DECLCALLBACKMEMBER(int, pfnZeroFill)(void *pvThis, RTFOFF cb);
     959    DECLCALLBACKMEMBER(int, pfnZeroFill,(void *pvThis, RTFOFF cb));
    960960
    961961    /** Marks the end of the structure (RTVFSIOSTREAMOPS_VERSION). */
    … …  
    10361036     * @sa      RTFileSeek
    10371037     */
    1038     DECLCALLBACKMEMBER(int, pfnSeek)(void *pvThis, RTFOFF offSeek, unsigned uMethod, PRTFOFF poffActual);
     1038    DECLCALLBACKMEMBER(int, pfnSeek,(void *pvThis, RTFOFF offSeek, unsigned uMethod, PRTFOFF poffActual));
    10391039
    10401040    /**
    … …  
    10461046     * @sa      RTFileQuerySize
    10471047     */
    1048     DECLCALLBACKMEMBER(int, pfnQuerySize)(void *pvThis, uint64_t *pcbFile);
     1048    DECLCALLBACKMEMBER(int, pfnQuerySize,(void *pvThis, uint64_t *pcbFile));
    10491049
    10501050    /**
    … …  
    10661066     * @sa      RTFileSetSize, RTFileSetAllocationSize
    10671067     */
    1068     DECLCALLBACKMEMBER(int, pfnSetSize)(void *pvThis, uint64_t cbFile, uint32_t fFlags);
     1068    DECLCALLBACKMEMBER(int, pfnSetSize,(void *pvThis, uint64_t cbFile, uint32_t fFlags));
    10691069
    10701070    /**
    … …  
    10801080     * @sa      RTFileQueryMaxSizeEx
    10811081     */
    1082     DECLCALLBACKMEMBER(int, pfnQueryMaxSize)(void *pvThis, uint64_t *pcbMax);
     1082    DECLCALLBACKMEMBER(int, pfnQueryMaxSize,(void *pvThis, uint64_t *pcbMax));
    10831083
    10841084    /** @todo There will be more methods here. */
    … …  
    13371337     *                          available.  Optional.
    13381338     */
    1339     DECLCALLBACKMEMBER(int, pfnValidate)(PCRTVFSCHAINELEMENTREG pProviderReg, PRTVFSCHAINSPEC pSpec,
    1340                                          PRTVFSCHAINELEMSPEC pElement, uint32_t *poffError, PRTERRINFO pErrInfo);
     1339    DECLCALLBACKMEMBER(int, pfnValidate,(PCRTVFSCHAINELEMENTREG pProviderReg, PRTVFSCHAINSPEC pSpec,
     1340                                         PRTVFSCHAINELEMSPEC pElement, uint32_t *poffError, PRTERRINFO pErrInfo));
    13411341
    13421342    /**
    … …  
    13561356     *                          available.  Optional.
    13571357     */
    1358     DECLCALLBACKMEMBER(int, pfnInstantiate)(PCRTVFSCHAINELEMENTREG pProviderReg, PCRTVFSCHAINSPEC pSpec,
     1358    DECLCALLBACKMEMBER(int, pfnInstantiate,(PCRTVFSCHAINELEMENTREG pProviderReg, PCRTVFSCHAINSPEC pSpec,
    13591359                                            PCRTVFSCHAINELEMSPEC pElement, RTVFSOBJ hPrevVfsObj,
    1360                                             PRTVFSOBJ phVfsObj, uint32_t *poffError, PRTERRINFO pErrInfo);
     1360                                            PRTVFSOBJ phVfsObj, uint32_t *poffError, PRTERRINFO pErrInfo));
    13611361
    13621362    /**
    … …  
    13771377     *                          element that is being considered for reuse.
    13781378     */
    1379     DECLCALLBACKMEMBER(bool, pfnCanReuseElement)(PCRTVFSCHAINELEMENTREG pProviderReg,
     1379    DECLCALLBACKMEMBER(bool, pfnCanReuseElement,(PCRTVFSCHAINELEMENTREG pProviderReg,
    13801380                                                 PCRTVFSCHAINSPEC pSpec, PCRTVFSCHAINELEMSPEC pElement,
    1381                                                  PCRTVFSCHAINSPEC pReuseSpec, PCRTVFSCHAINELEMSPEC pReuseElement);
     1381                                                 PCRTVFSCHAINSPEC pReuseSpec, PCRTVFSCHAINELEMSPEC pReuseElement));
    13821382
    13831383    /** End marker (RTVFSCHAINELEMENTREG_VERSION). */

  • trunk/include/iprt/win/commctrl.h

    r85108 r85121  
    11/** @file
    2  * Safe way to include shlobj.h.
     2 * Safe way to include commctrl.h.
    33 */
    44
    … …  
    2424 */
    2525
    26 #ifndef IPRT_INCLUDED_win_shlobj_h
    27 #define IPRT_INCLUDED_win_shlobj_h
     26#ifndef IPRT_INCLUDED_win_commctrl_h
     27#define IPRT_INCLUDED_win_commctrl_h
    2828#ifndef RT_WITHOUT_PRAGMA_ONCE
    2929# pragma once
    … …  
    3232#ifdef _MSC_VER
    3333# pragma warning(push)
    34 # pragma warning(disable:4668) /* warning C4668: 'USE_SP_ALTPLATFORM_INFO_V1' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' */
    35 # if _MSC_VER >= 1800 /*RT_MSC_VER_VC120*/
    36 #  pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
    37 #  pragma warning(disable:4255) /* windef.h(227) : warning C4255: 'NEARPROC' : no function prototype given: converting '()' to '(void)' */
    38 # endif
    3934# if _MSC_VER >= 1900 /*RT_MSC_VER_VC140*/
    40 #  pragma warning(disable:4091) /* sdk/v7.1/include/shlobj.h(1151): warning C4091: 'typedef ': ignored on left of 'tagGPFIDL_FLAGS' when no variable is declared */
    41 # endif
    42 # if _MSC_VER >= 1910 /*RT_MSC_VER_VC141*/
    43 #  pragma warning(disable:4768) /* sdk/v7.1/include/shlobj.h(1065): warning C4768: __declspec attributes before linkage specification are ignored */
     35#  ifdef __cplusplus
     36#   pragma warning(disable:5039) /* commctrl.h(8323): warning C5039: 'DSA_DestroyCallback': pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception. */
     37#  endif
    4438# endif
    4539#endif
    4640
    47 #include <shlobj.h>
     41#include <commctrl.h>
    4842
    4943#ifdef _MSC_VER
    … …  
    5145#endif
    5246
    53 #endif /* !IPRT_INCLUDED_win_shlobj_h */
     47#endif /* !IPRT_INCLUDED_win_commctrl_h */
    5448

  • trunk/include/iprt/win/credentialprovider.h

    r85108 r85121  
    11/** @file
    2  * Safe way to include shlobj.h.
     2 * Safe way to include credentialprovider.h.
    33 */
    44
    … …  
    2424 */
    2525
    26 #ifndef IPRT_INCLUDED_win_shlobj_h
    27 #define IPRT_INCLUDED_win_shlobj_h
     26#ifndef IPRT_INCLUDED_win_credentialprovider_h
     27#define IPRT_INCLUDED_win_credentialprovider_h
    2828#ifndef RT_WITHOUT_PRAGMA_ONCE
    2929# pragma once
    … …  
    3232#ifdef _MSC_VER
    3333# pragma warning(push)
    34 # pragma warning(disable:4668) /* warning C4668: 'USE_SP_ALTPLATFORM_INFO_V1' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' */
    35 # if _MSC_VER >= 1800 /*RT_MSC_VER_VC120*/
    36 #  pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
    37 #  pragma warning(disable:4255) /* windef.h(227) : warning C4255: 'NEARPROC' : no function prototype given: converting '()' to '(void)' */
    38 # endif
    3934# if _MSC_VER >= 1900 /*RT_MSC_VER_VC140*/
    40 #  pragma warning(disable:4091) /* sdk/v7.1/include/shlobj.h(1151): warning C4091: 'typedef ': ignored on left of 'tagGPFIDL_FLAGS' when no variable is declared */
    41 # endif
    42 # if _MSC_VER >= 1910 /*RT_MSC_VER_VC141*/
    43 #  pragma warning(disable:4768) /* sdk/v7.1/include/shlobj.h(1065): warning C4768: __declspec attributes before linkage specification are ignored */
     35#  ifdef __cplusplus
     36#   pragma warning(disable:5039) /* commctrl.h(8323): warning C5039: 'DSA_DestroyCallback': pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception. */
     37#  endif
    4438# endif
    4539#endif
    4640
    47 #include <shlobj.h>
     41#include <credentialprovider.h>
    4842
    4943#ifdef _MSC_VER
    … …  
    5145#endif
    5246
    53 #endif /* !IPRT_INCLUDED_win_shlobj_h */
     47#endif /* !IPRT_INCLUDED_win_credentialprovider_h */
    5448

  • trunk/include/iprt/win/d3d9.h

    r82968 r85121  
    3838#  pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
    3939# endif
     40# ifdef __cplusplus
     41#  if _MSC_VER >= 1900 /*RT_MSC_VER_VC140*/
     42#   pragma warning(disable:5039) /* winbase.h(13179): warning C5039: 'TpSetCallbackCleanupGroup': pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception. */
     43#  endif
     44# endif
    4045#endif
    4146

  • trunk/include/iprt/win/objbase.h

    r82968 r85121  
    3939#  pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
    4040# endif
     41# ifdef __cplusplus
     42#  if _MSC_VER >= 1900 /*RT_MSC_VER_VC140*/
     43#   pragma warning(disable:5039) /* winbase.h(13179): warning C5039: 'TpSetCallbackCleanupGroup': pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception. */
     44#  endif
     45# endif
    4146#endif
    4247

  • trunk/include/iprt/win/objidl.h

    r82968 r85121  
    3030#endif
    3131
    32 #pragma warning(push)
    33 #pragma warning(disable:4668) /* '__midl' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' */
    34 #if _MSC_VER >= 1800 /*RT_MSC_VER_VC120*/
    35 # pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
    36 # pragma warning(disable:4255) /* windef.h(227) : warning C4255: 'NEARPROC' : no function prototype given: converting '()' to '(void)' */
     32#ifdef _MSC_VER
     33# pragma warning(push)
     34# pragma warning(disable:4668) /* '__midl' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' */
     35# if _MSC_VER >= 1800 /*RT_MSC_VER_VC120*/
     36#  pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
     37#  pragma warning(disable:4255) /* windef.h(227) : warning C4255: 'NEARPROC' : no function prototype given: converting '()' to '(void)' */
     38# endif
     39# ifdef __cplusplus
     40#  if _MSC_VER >= 1900 /*RT_MSC_VER_VC140*/
     41#   pragma warning(disable:5039) /* winbase.h(13179): warning C5039: 'TpSetCallbackCleanupGroup': pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception. */
     42#  endif
     43# endif
    3744#endif
    3845
    3946#include <objidl.h>
    4047
    41 #pragma warning(pop)
     48#ifdef _MSC_VER
     49# pragma warning(pop)
     50#endif
    4251
    4352#endif /* !IPRT_INCLUDED_win_objidl_h */

  • trunk/include/iprt/win/setupapi.h

    r82968 r85121  
    3030#endif
    3131
    32 #pragma warning(push)
    33 #pragma warning(disable:4668) /* warning C4668: 'USE_SP_ALTPLATFORM_INFO_V1' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' */
     32#ifdef _MSC_VER
     33# pragma warning(push)
     34# pragma warning(disable:4668) /* warning C4668: 'USE_SP_ALTPLATFORM_INFO_V1' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' */
     35# ifdef __cplusplus
     36#  if _MSC_VER >= 1900 /*RT_MSC_VER_VC140*/
     37#   pragma warning(disable:5039) /* winbase.h(13179): warning C5039: 'TpSetCallbackCleanupGroup': pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception. */
     38#  endif
     39# endif
     40#endif
    3441
    3542#include <setupapi.h>
    3643
    37 #pragma warning(pop)
     44#ifdef _MSC_VER
     45# pragma warning(pop)
     46#endif
    3847
    3948#endif /* !IPRT_INCLUDED_win_setupapi_h */

  • trunk/include/iprt/win/shlobj.h

    r84406 r85121  
    3939# if _MSC_VER >= 1900 /*RT_MSC_VER_VC140*/
    4040#  pragma warning(disable:4091) /* sdk/v7.1/include/shlobj.h(1151): warning C4091: 'typedef ': ignored on left of 'tagGPFIDL_FLAGS' when no variable is declared */
     41#  ifdef __cplusplus
     42#   pragma warning(disable:5039) /* commctrl.h(8323): warning C5039: 'DSA_DestroyCallback': pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception. */
     43#  endif
    4144# endif
    4245# if _MSC_VER >= 1910 /*RT_MSC_VER_VC141*/

  • trunk/include/iprt/win/windows.h

    r82968 r85121  
    4141#  pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
    4242# endif
    43 # ifndef __cplusplus
     43# ifdef __cplusplus
     44#  if _MSC_VER >= 1900 /*RT_MSC_VER_VC140*/
     45#   pragma warning(disable:5039) /* winbase.h(13179): warning C5039: 'TpSetCallbackCleanupGroup': pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception. */
     46#  endif
     47# else
    4448#  pragma warning(disable:4255) /* warning C4255: 'FARPROC' : no function prototype given: converting '()' to '(void)' */
    4549# endif

  • trunk/include/iprt/win/winsock2.h

    r82968 r85121  
    4343#  pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
    4444# endif
     45# if _MSC_VER >= 1900 /*RT_MSC_VER_VC140*/
     46#  ifdef __cplusplus
     47#   pragma warning(disable:5039) /* winbase.h(13179): warning C5039: 'TpSetCallbackCleanupGroup': pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception. */
     48#  endif
     49# endif
    4550#endif
    4651

  • trunk/include/iprt/win/ws2tcpip.h

    r82968 r85121  
    3030#endif
    3131
    32 #pragma warning(push)
    33 #pragma warning(disable:4668) /* 'NDIS_SUPPORT_NDIS6' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' */
    34 #if _MSC_VER >= 1800 /*RT_MSC_VER_VC120*/
    35 # pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
    36 # pragma warning(disable:4255) /* windef.h(227) : warning C4255: 'NEARPROC' : no function prototype given: converting '()' to '(void)' */
     32#ifdef _MSC_VER
     33# pragma warning(push)
     34# pragma warning(disable:4668) /* 'NDIS_SUPPORT_NDIS6' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif' */
     35# if _MSC_VER >= 1800 /*RT_MSC_VER_VC120*/
     36#  pragma warning(disable:4005) /* sdk/v7.1/include/sal_supp.h(57) : warning C4005: '__useHeader' : macro redefinition */
     37#  pragma warning(disable:4255) /* windef.h(227) : warning C4255: 'NEARPROC' : no function prototype given: converting '()' to '(void)' */
     38# endif
     39# if _MSC_VER >= 1900 /*RT_MSC_VER_VC140*/
     40#  ifdef __cplusplus
     41#   pragma warning(disable:5039) /* ws2tcpip.h(874): warning C5039: 'WSAIoctl': pointer or reference to potentially throwing function passed to 'extern "C"' function under -EHc. Undefined behavior may occur if this function throws an exception. */
     42#  endif
     43# endif
    3744#endif
    3845
    3946#include <ws2tcpip.h>
    4047
    41 #pragma warning(pop)
     48#ifdef _MSC_VER
     49# pragma warning(pop)
     50#endif
    4251
    4352#endif /* !IPRT_INCLUDED_win_ws2tcpip_h */

  • trunk/include/iprt/zip.h

    r84234 r85121  
    5050 * @param   cbBuf       Size of the compressed data.
    5151 */
    52 typedef DECLCALLBACK(int) FNRTZIPOUT(void *pvUser, const void *pvBuf, size_t cbBuf);
     52typedef DECLCALLBACKTYPE(int, FNRTZIPOUT,(void *pvUser, const void *pvBuf, size_t cbBuf));
    5353/** Pointer to FNRTZIPOUT() function. */
    5454typedef FNRTZIPOUT *PFNRTZIPOUT;
    … …  
    6363 * @param   pcbBuf      Number of bytes actually stored in the buffer.
    6464 */
    65 typedef DECLCALLBACK(int) FNRTZIPIN(void *pvUser, void *pvBuf, size_t cbBuf, size_t *pcbBuf);
     65typedef DECLCALLBACKTYPE(int, FNRTZIPIN,(void *pvUser, void *pvBuf, size_t cbBuf, size_t *pcbBuf));
    6666/** Pointer to FNRTZIPIN() function. */
    6767typedef FNRTZIPIN *PFNRTZIPIN;
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