VirtualBox

Changeset 85121 in vbox for trunk/src/VBox/Runtime


Ignore:
Timestamp:
Jul 8, 2020 7:33:26 PM (5 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
139061
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/src/VBox/Runtime
Files:
2 added
57 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Runtime/.scm-settings

    r83864 r85121  
    6464/common/math/gcc/quad.h                        : --no-fix-header-guards
    6565/common/misc/sanity.h                          : --no-fix-header-guards
     66/include/internal/openssl-p*.h                 : --no-fix-header-guards
    6667/*.h: --guard-relative-to-dir . --guard-prefix IPRT_INCLUDED_SRC_
    6768/include/internal/*.h: --guard-relative-to-dir include/internal --guard-prefix IPRT_INCLUDED_INTERNAL_

  • trunk/src/VBox/Runtime/VBox/VBoxRTDeps.cpp

    r83233 r85121  
    4040#include <libxml/catalog.h>
    4141#include <libxml/globals.h>
    42 #include <openssl/md5.h>
    43 #include <openssl/rc4.h>
    4442#ifdef RT_OS_WINDOWS
    4543# include <iprt/win/windows.h>
    4644#endif
     45#include "internal/openssl-pre.h"
     46#include <openssl/md5.h>
     47#include <openssl/rc4.h>
    4748#include <openssl/pem.h> /* drags in Windows.h */
    4849#include <openssl/x509.h>
    … …  
    5051#include <openssl/ssl.h>
    5152#include <openssl/rand.h>
     53#include "internal/openssl-post.h"
    5254
    5355

  • trunk/src/VBox/Runtime/common/alloc/memtracker.cpp

    r82968 r85121  
    182182{
    183183    /** The printf like callback. */
    184     DECLCALLBACKMEMBER(void, pfnPrintf)(struct RTMEMTRACKEROUTPUT *pThis, const char *pszFormat, ...);
     184    DECLCALLBACKMEMBER(void, pfnPrintf,(struct RTMEMTRACKEROUTPUT *pThis, const char *pszFormat, ...));
    185185
    186186    /** The data. */

  • trunk/src/VBox/Runtime/common/checksum/openssl-md2.cpp

    r82968 r85121  
    3131#include "internal/iprt.h"
    3232
     33#include "internal/openssl-pre.h"
    3334#include <openssl/opensslconf.h>
    3435#ifndef OPENSSL_NO_MD2
    3536# include <openssl/md2.h>
     37#endif
     38#include "internal/openssl-post.h"
    3639
     40#ifndef OPENSSL_NO_MD2
    3741# define RT_MD2_PRIVATE_CONTEXT
    3842# include <iprt/md2.h>

  • trunk/src/VBox/Runtime/common/checksum/openssl-md4.cpp

    r82968 r85121  
    3131#include "internal/iprt.h"
    3232
     33#include "internal/openssl-pre.h"
    3334#include <openssl/opensslconf.h>
     35#include "internal/openssl-post.h"
    3436#if 0 //ndef OPENSSL_NO_MD4
    3537# include <openssl/md4.h>

  • trunk/src/VBox/Runtime/common/checksum/openssl-md5.cpp

    r82968 r85121  
    3131#include "internal/iprt.h"
    3232
     33#include "internal/openssl-pre.h"
    3334#include <openssl/md5.h>
     35#include "internal/openssl-post.h"
    3436
    3537#define RT_MD5_OPENSSL_PRIVATE_CONTEXT

  • trunk/src/VBox/Runtime/common/checksum/openssl-sha1.cpp

    r82968 r85121  
    3131#include "internal/iprt.h"
    3232
     33#include "internal/openssl-pre.h"
    3334#include <openssl/sha.h>
     35#include "internal/openssl-post.h"
    3436
    3537#define RT_SHA1_PRIVATE_CONTEXT

  • trunk/src/VBox/Runtime/common/checksum/openssl-sha256.cpp

    r82968 r85121  
    3131#include "internal/iprt.h"
    3232
     33#include "internal/openssl-pre.h"
    3334#include <openssl/sha.h>
     35#include "internal/openssl-post.h"
    3436
    3537#define RT_SHA256_PRIVATE_CONTEXT

  • trunk/src/VBox/Runtime/common/checksum/openssl-sha512.cpp

    r82968 r85121  
    3131#include "internal/iprt.h"
    3232
     33#include "internal/openssl-pre.h"
    3334#include <openssl/sha.h>
     35#include "internal/openssl-post.h"
    3436
    3537#define RT_SHA512_PRIVATE_CONTEXT

  • trunk/src/VBox/Runtime/common/crypto/RTCrPkcs5Pbkdf2Hmac-openssl.cpp

    r82968 r85121  
    3838
    3939# include "internal/iprt-openssl.h"
    40 # include "openssl/evp.h"
     40# include "internal/openssl-pre.h"
     41# include <openssl/evp.h>
     42# include "internal/openssl-post.h"
    4143
    4244

  • trunk/src/VBox/Runtime/common/crypto/RTCrRandBytes-openssl.cpp

    r82968 r85121  
    3838
    3939# include "internal/iprt-openssl.h"
    40 # include "openssl/rand.h"
     40# include "internal/openssl-pre.h"
     41# include <openssl/rand.h>
     42# include "internal/openssl-post.h"
    4143
    4244

  • trunk/src/VBox/Runtime/common/crypto/cipher-openssl.cpp

    r82968 r85121  
    4040
    4141# include "internal/iprt-openssl.h"
    42 # include "openssl/evp.h"
     42# include "internal/openssl-pre.h"
     43# include <openssl/evp.h>
     44# include "internal/openssl-post.h"
    4345
    4446# include "internal/magics.h"

  • trunk/src/VBox/Runtime/common/crypto/digest-builtin.cpp

    r84251 r85121  
    4343#ifdef IPRT_WITH_OPENSSL
    4444# include "internal/iprt-openssl.h"
     45# include "internal/openssl-pre.h"
    4546# include <openssl/evp.h>
     47# include "internal/openssl-post.h"
    4648#endif
    4749

  • trunk/src/VBox/Runtime/common/crypto/iprt-openssl.cpp

    r84310 r85121  
    3939
    4040# include "internal/iprt-openssl.h"
     41# include "internal/openssl-pre.h"
    4142# include <openssl/x509.h>
    4243# include <openssl/err.h>
     44# include "internal/openssl-post.h"
    4345
    4446

  • trunk/src/VBox/Runtime/common/crypto/key-create-rsa-openssl.cpp

    r82968 r85121  
    3737
    3838# include "internal/iprt-openssl.h"
     39# include "internal/openssl-pre.h"
    3940# include <openssl/rsa.h>
    4041# include <openssl/err.h>
     42# include "internal/openssl-post.h"
    4143
    4244# include "key-internal.h"

  • trunk/src/VBox/Runtime/common/crypto/key-file.cpp

    r82968 r85121  
    5050#ifdef IPRT_WITH_OPENSSL
    5151# include "internal/iprt-openssl.h"
    52 # include "openssl/evp.h"
     52# include "internal/openssl-pre.h"
     53# include <openssl/evp.h>
     54# include "internal/openssl-post.h"
    5355# ifndef OPENSSL_VERSION_NUMBER
    5456#  error "Missing OPENSSL_VERSION_NUMBER!"

  • trunk/src/VBox/Runtime/common/crypto/key-openssl.cpp

    r84230 r85121  
    4040# include "internal/iprt-openssl.h"
    4141# include "internal/magics.h"
    42 # include "openssl/evp.h"
     42# include "internal/openssl-pre.h"
     43# include <openssl/evp.h>
     44# include "internal/openssl-post.h"
    4345# ifndef OPENSSL_VERSION_NUMBER
    4446#  error "Missing OPENSSL_VERSION_NUMBER!"

  • trunk/src/VBox/Runtime/common/crypto/pkcs7-sign.cpp

    r84256 r85121  
    4242#ifdef IPRT_WITH_OPENSSL
    4343# include "internal/iprt-openssl.h"
     44# include "internal/openssl-pre.h"
    4445# include <openssl/pkcs7.h>
    4546# include <openssl/cms.h>
    4647# include <openssl/x509.h>
    4748# include <openssl/err.h>
     49# include "internal/openssl-post.h"
    4850#endif
    4951

  • trunk/src/VBox/Runtime/common/crypto/pkcs7-verify.cpp

    r84380 r85121  
    4343#ifdef IPRT_WITH_OPENSSL
    4444# include "internal/iprt-openssl.h"
     45# include "internal/openssl-pre.h"
    4546# include <openssl/pkcs7.h>
    4647# include <openssl/x509.h>
    4748# include <openssl/err.h>
     49# include "internal/openssl-post.h"
    4850#endif
    4951

  • trunk/src/VBox/Runtime/common/crypto/pkix-sign.cpp

    r84230 r85121  
    4141#ifdef IPRT_WITH_OPENSSL
    4242# include "internal/iprt-openssl.h"
    43 # include "openssl/evp.h"
    44 # include "openssl/rsa.h"
     43# include "internal/openssl-pre.h"
     44# include <openssl/evp.h>
     45# include <openssl/rsa.h>
     46# include "internal/openssl-post.h"
    4547# ifndef OPENSSL_VERSION_NUMBER
    4648#  error "Missing OPENSSL_VERSION_NUMBER!"

  • trunk/src/VBox/Runtime/common/crypto/pkix-signature-builtin.cpp

    r82968 r85121  
    3737#ifdef IPRT_WITH_OPENSSL
    3838# include "internal/iprt-openssl.h"
     39# include "internal/openssl-pre.h"
    3940# include <openssl/evp.h>
     41# include "internal/openssl-post.h"
    4042#endif
    4143

  • trunk/src/VBox/Runtime/common/crypto/pkix-util.cpp

    r84248 r85121  
    4040#ifdef IPRT_WITH_OPENSSL
    4141# include "internal/iprt-openssl.h"
    42 # include "openssl/evp.h"
     42# include "internal/openssl-pre.h"
     43# include <openssl/evp.h>
     44# include "internal/openssl-post.h"
    4345#endif
    4446

  • trunk/src/VBox/Runtime/common/crypto/pkix-verify.cpp

    r84230 r85121  
    3939#ifdef IPRT_WITH_OPENSSL
    4040# include "internal/iprt-openssl.h"
    41 # include "openssl/evp.h"
     41# include "internal/openssl-pre.h"
     42# include <openssl/evp.h>
     43# include "internal/openssl-post.h"
    4244# ifndef OPENSSL_VERSION_NUMBER
    4345#  error "Missing OPENSSL_VERSION_NUMBER!"

  • trunk/src/VBox/Runtime/common/crypto/rc4-openssl.cpp

    r82968 r85121  
    3232# include "internal/iprt.h"
    3333# include "internal/iprt-openssl.h"
    34 # include "openssl/rc4.h"
     34# include "internal/openssl-pre.h"
     35# include <openssl/rc4.h>
     36# include "internal/openssl-post.h"
    3537# include <iprt/crypto/rc4.h>
    3638

  • trunk/src/VBox/Runtime/common/crypto/ssl-openssl.cpp

    r82968 r85121  
    4242
    4343# include "internal/iprt-openssl.h"
     44# include "internal/openssl-pre.h"
    4445# include <openssl/ssl.h>
    4546# include <openssl/tls1.h>
     47# include "internal/openssl-post.h"
    4648
    4749

  • trunk/src/VBox/Runtime/common/crypto/store-internal.h

    r84329 r85121  
    4949     * @param   pCertCtx        The internal certificate context.
    5050     */
    51     DECLCALLBACKMEMBER(void, pfnDtor)(struct RTCRCERTCTXINT *pCertCtx);
     51    DECLCALLBACKMEMBER(void, pfnDtor,(struct RTCRCERTCTXINT *pCertCtx));
    5252    /** The public store context. */
    5353    RTCRCERTCTX             Public;
    … …  
    7777     * @param   pvProvider      The provider specific data.
    7878     */
    79     DECLCALLBACKMEMBER(void, pfnDestroyStore)(void *pvProvider);
     79    DECLCALLBACKMEMBER(void, pfnDestroyStore,(void *pvProvider));
    8080
    8181    /**
    … …  
    9393     * @param   pcbKeyRet       Where to return the size of the returned key.
    9494     */
    95     DECLCALLBACKMEMBER(int, pfnCertCtxQueryPrivateKey)(void *pvProvider, PRTCRCERTCTXINT pCertCtx,
    96                                                        uint8_t *pbKey, size_t cbKey, size_t *pcbKeyRet);
     95    DECLCALLBACKMEMBER(int, pfnCertCtxQueryPrivateKey,(void *pvProvider, PRTCRCERTCTXINT pCertCtx,
     96                                                       uint8_t *pbKey, size_t cbKey, size_t *pcbKeyRet));
    9797
    9898    /**
    … …  
    104104     *                          provider should initalize this on success.
    105105     */
    106     DECLCALLBACKMEMBER(int, pfnCertFindAll)(void *pvProvider, PRTCRSTORECERTSEARCH pSearch);
     106    DECLCALLBACKMEMBER(int, pfnCertFindAll,(void *pvProvider, PRTCRSTORECERTSEARCH pSearch));
    107107
    108108    /**
    … …  
    114114     * @param   pSearch         Pointer to opaque search state structure.
    115115     */
    116     DECLCALLBACKMEMBER(PCRTCRCERTCTX, pfnCertSearchNext)(void *pvProvider, PRTCRSTORECERTSEARCH pSearch);
     116    DECLCALLBACKMEMBER(PCRTCRCERTCTX, pfnCertSearchNext,(void *pvProvider, PRTCRSTORECERTSEARCH pSearch));
    117117
    118118    /**
    … …  
    122122     * @param   pSearch         Pointer to opaque search state structure to destroy.
    123123     */
    124     DECLCALLBACKMEMBER(void, pfnCertSearchDestroy)(void *pvProvider, PRTCRSTORECERTSEARCH pSearch);
     124    DECLCALLBACKMEMBER(void, pfnCertSearchDestroy,(void *pvProvider, PRTCRSTORECERTSEARCH pSearch));
    125125
    126126    /**
    … …  
    136136     * @param   pErrInfo        Where to store extended error info. Optional.
    137137     */
    138     DECLCALLBACKMEMBER(int, pfnCertAddEncoded)(void *pvProvider, uint32_t fFlags, uint8_t const *pbEncoded, uint32_t cbEncoded,
    139                                                PRTERRINFO pErrInfo);
     138    DECLCALLBACKMEMBER(int, pfnCertAddEncoded,(void *pvProvider, uint32_t fFlags, uint8_t const *pbEncoded, uint32_t cbEncoded,
     139                                               PRTERRINFO pErrInfo));
    140140
    141141
    … …  
    151151     * @param   phSearch        Pointer to a provider specific search handle.
    152152     */
    153     DECLCALLBACKMEMBER(int, pfnCertFindByIssuerAndSerialNo)(void *pvProvider, PCRTCRX509NAME pIssuer, PCRTASN1INTEGER pSerialNo,
    154                                                             PRTCRSTORECERTSEARCH phSearch);
     153    DECLCALLBACKMEMBER(int, pfnCertFindByIssuerAndSerialNo,(void *pvProvider, PCRTCRX509NAME pIssuer, PCRTASN1INTEGER pSerialNo,
     154                                                            PRTCRSTORECERTSEARCH phSearch));
    155155    /** Non-zero end marker. */
    156156    uintptr_t               uEndMarker;

  • trunk/src/VBox/Runtime/common/crypto/store.cpp

    r84329 r85121  
    4141
    4242#ifdef IPRT_WITH_OPENSSL
     43# include "internal/openssl-pre.h"
    4344# include <openssl/x509.h>
     45# include "internal/openssl-post.h"
    4446#endif
    4547

  • trunk/src/VBox/Runtime/common/dbg/dbgmodcodeview.cpp

    r82968 r85121  
    188188 * @param   pDirEnt         The directory entry.
    189189 */
    190 typedef DECLCALLBACK(int) FNDBGMODCVSUBSECTCALLBACK(PRTDBGMODCV pThis, void const *pvSubSect, size_t cbSubSect,
    191                                                     PCRTCVDIRENT32 pDirEnt);
     190typedef DECLCALLBACKTYPE(int, FNDBGMODCVSUBSECTCALLBACK,(PRTDBGMODCV pThis, void const *pvSubSect, size_t cbSubSect,
     191                                                         PCRTCVDIRENT32 pDirEnt));
    192192/** Pointer to a subsection callback. */
    193193typedef FNDBGMODCVSUBSECTCALLBACK *PFNDBGMODCVSUBSECTCALLBACK;

  • trunk/src/VBox/Runtime/common/dbg/dbgmoddwarf.cpp

    r83084 r85121  
    297297 * @param   pCursor         The cursor to read data from.
    298298 */
    299 typedef DECLCALLBACK(int) FNRTDWARFATTRDECODER(PRTDWARFDIE pDie, uint8_t *pbMember, PCRTDWARFATTRDESC pDesc,
    300                                                uint32_t uForm, PRTDWARFCURSOR pCursor);
     299typedef DECLCALLBACKTYPE(int, FNRTDWARFATTRDECODER,(PRTDWARFDIE pDie, uint8_t *pbMember, PCRTDWARFATTRDESC pDesc,
     300                                                    uint32_t uForm, PRTDWARFCURSOR pCursor));
    301301/** Pointer to an attribute decoder callback. */
    302302typedef FNRTDWARFATTRDECODER *PFNRTDWARFATTRDECODER;

  • trunk/src/VBox/Runtime/common/err/errmsg-sorter.cpp

    r84130 r85121  
    124124
    125125/** qsort callback. */
    126 static int CompareErrMsg(const void *pv1, const void *pv2)
     126static int CompareErrMsg(const void *pv1, const void *pv2) RT_NOTHROW_DEF
    127127{
    128128    PRTSTATUSMSGINT1 p1 = (PRTSTATUSMSGINT1)pv1;

  • trunk/src/VBox/Runtime/common/fuzz/fuzz.cpp

    r83426 r85121  
    5151
    5252
     53/*********************************************************************************************************************************
     54*   Defined Constants And Macros                                                                                                 *
     55*********************************************************************************************************************************/
    5356#define RTFUZZCTX_MAGIC UINT32_C(0xdeadc0de) /** @todo */
    5457
    … …  
    9699 * @param   ppMutation          Where to store the created mutation on success.
    97100 */
    98 typedef DECLCALLBACK(int) FNRTFUZZCTXMUTATORPREP(PRTFUZZCTXINT pThis, uint64_t offStart, PRTFUZZMUTATION pMutationParent,
    99                                                  PPRTFUZZMUTATION ppMutation);
     101typedef DECLCALLBACKTYPE(int, FNRTFUZZCTXMUTATORPREP,(PRTFUZZCTXINT pThis, uint64_t offStart, PRTFUZZMUTATION pMutationParent,
     102                                                      PPRTFUZZMUTATION ppMutation));
    100103/** Pointer to a mutator preparation callback. */
    101104typedef FNRTFUZZCTXMUTATORPREP *PFNRTFUZZCTXMUTATORPREP;
    … …  
    112115 * @param   cbBuf               Size of the remaining buffer.
    113116 */
    114 typedef DECLCALLBACK(int) FNRTFUZZCTXMUTATOREXEC(PRTFUZZCTXINT pThis, PCRTFUZZMUTATION pMutation, const void *pvMutation,
    115                                                  uint8_t *pbBuf, size_t cbBuf);
     117typedef DECLCALLBACKTYPE(int, FNRTFUZZCTXMUTATOREXEC,(PRTFUZZCTXINT pThis, PCRTFUZZMUTATION pMutation, const void *pvMutation,
     118                                                      uint8_t *pbBuf, size_t cbBuf));
    116119/** Pointer to a mutator execution callback. */
    117120typedef FNRTFUZZCTXMUTATOREXEC *PFNRTFUZZCTXMUTATOREXEC;
    … …  
    128131 * @param   pvUser              Opaque user data to pass to the export callback.
    129132 */
    130 typedef DECLCALLBACK(int) FNRTFUZZCTXMUTATOREXPORT(PRTFUZZCTXINT pThis, PCRTFUZZMUTATION pMutation, const void *pvMutation,
    131                                                    PFNRTFUZZCTXEXPORT pfnExport, void *pvUser);
     133typedef DECLCALLBACKTYPE(int, FNRTFUZZCTXMUTATOREXPORT,(PRTFUZZCTXINT pThis, PCRTFUZZMUTATION pMutation, const void *pvMutation,
     134                                                        PFNRTFUZZCTXEXPORT pfnExport, void *pvUser));
    132135/** Pointer to a mutator export callback. */
    133136typedef FNRTFUZZCTXMUTATOREXPORT *PFNRTFUZZCTXMUTATOREXPORT;
    … …  
    144147 * @param   pvUser              Opaque user data to pass to the import callback.
    145148 */
    146 typedef DECLCALLBACK(int) FNRTFUZZCTXMUTATORIMPORT(PRTFUZZCTXINT pThis, PCRTFUZZMUTATION pMutation, void *pvMutation,
    147                                                    PFNRTFUZZCTXIMPORT pfnImport, void *pvUser);
     149typedef DECLCALLBACKTYPE(int, FNRTFUZZCTXMUTATORIMPORT,(PRTFUZZCTXINT pThis, PCRTFUZZMUTATION pMutation, void *pvMutation,
     150                                                        PFNRTFUZZCTXIMPORT pfnImport, void *pvUser));
    148151/** Pointer to a mutator import callback. */
    149152typedef FNRTFUZZCTXMUTATORIMPORT *PFNRTFUZZCTXMUTATORIMPORT;

  • trunk/src/VBox/Runtime/common/fuzz/fuzzclientcmd.cpp

    r82968 r85121  
    4646
    4747
    48 
    49 typedef DECLCALLBACK(int) FNLLVMFUZZERTESTONEINPUT(const uint8_t *pbData, size_t cbData);
     48/*********************************************************************************************************************************
     49*   Structures and Typedefs                                                                                                      *
     50*********************************************************************************************************************************/
     51typedef DECLCALLBACKTYPE(int, FNLLVMFUZZERTESTONEINPUT,(const uint8_t *pbData, size_t cbData));
    5052typedef FNLLVMFUZZERTESTONEINPUT *PFNLLVMFUZZERTESTONEINPUT;
    5153

  • trunk/src/VBox/Runtime/common/ldr/ldrPE.cpp

    r84361 r85121  
    164164     * @param   pvUser          User argument to pass to the callback.
    165165     */
    166     DECLCALLBACKMEMBER(int, pfnResolveImports)(PRTLDRMODPE pModPe, const void *pvBitsR, void *pvBitsW, PFNRTLDRIMPORT pfnGetImport, void *pvUser);
     166    DECLCALLBACKMEMBER(int, pfnResolveImports,(PRTLDRMODPE pModPe, const void *pvBitsR, void *pvBitsW, PFNRTLDRIMPORT pfnGetImport, void *pvUser));
    167167
    168168    /** Dummy entry to make sure we've initialized it all. */

  • trunk/src/VBox/Runtime/common/log/tracelogreader.cpp

    r84500 r85121  
    232232 * @param   pfContinuePoll      Where to store the flag whether to continue polling.
    233233 */
    234 typedef DECLCALLBACK(int) FNRTTRACELOGRDRSTATEHANDLER(PRTTRACELOGRDRINT pThis, RTTRACELOGRDRPOLLEVT *penmEvt,
    235                                                       bool *pfContinuePoll);
     234typedef DECLCALLBACKTYPE(int, FNRTTRACELOGRDRSTATEHANDLER,(PRTTRACELOGRDRINT pThis, RTTRACELOGRDRPOLLEVT *penmEvt,
     235                                                           bool *pfContinuePoll));
    236236/** Pointer to a trace log reader state handler. */
    237237typedef FNRTTRACELOGRDRSTATEHANDLER *PFNRTTRACELOGRDRSTATEHANDLER;

  • trunk/src/VBox/Runtime/common/misc/json.cpp

    r83425 r85121  
    146146 * @param   pcbRead         Where to store the amount of data read on succcess.
    147147 */
    148 typedef DECLCALLBACK(int) FNRTJSONTOKENIZERREAD(void *pvUser, size_t offInput, void *pvBuf, size_t cbBuf,
    149                                                 size_t *pcbRead);
     148typedef DECLCALLBACKTYPE(int, FNRTJSONTOKENIZERREAD,(void *pvUser, size_t offInput, void *pvBuf, size_t cbBuf,
     149                                                     size_t *pcbRead));
    150150/** Pointer to a tokenizer read buffer callback. */
    151151typedef FNRTJSONTOKENIZERREAD *PFNRTJSONTOKENIZERREAD;

  • trunk/src/VBox/Runtime/common/misc/req.cpp

    r82968 r85121  
    364364            {
    365365                PFNRT pfn;
    366                 DECLCALLBACKMEMBER(int, pfn00)(void);
    367                 DECLCALLBACKMEMBER(int, pfn01)(uintptr_t);
    368                 DECLCALLBACKMEMBER(int, pfn02)(uintptr_t, uintptr_t);
    369                 DECLCALLBACKMEMBER(int, pfn03)(uintptr_t, uintptr_t, uintptr_t);
    370                 DECLCALLBACKMEMBER(int, pfn04)(uintptr_t, uintptr_t, uintptr_t, uintptr_t);
    371                 DECLCALLBACKMEMBER(int, pfn05)(uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t);
    372                 DECLCALLBACKMEMBER(int, pfn06)(uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t);
    373                 DECLCALLBACKMEMBER(int, pfn07)(uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t);
    374                 DECLCALLBACKMEMBER(int, pfn08)(uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t);
    375                 DECLCALLBACKMEMBER(int, pfn09)(uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t);
    376                 DECLCALLBACKMEMBER(int, pfn10)(uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t);
    377                 DECLCALLBACKMEMBER(int, pfn11)(uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t);
    378                 DECLCALLBACKMEMBER(int, pfn12)(uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t);
     366                DECLCALLBACKMEMBER(int, pfn00,(void));
     367                DECLCALLBACKMEMBER(int, pfn01,(uintptr_t));
     368                DECLCALLBACKMEMBER(int, pfn02,(uintptr_t, uintptr_t));
     369                DECLCALLBACKMEMBER(int, pfn03,(uintptr_t, uintptr_t, uintptr_t));
     370                DECLCALLBACKMEMBER(int, pfn04,(uintptr_t, uintptr_t, uintptr_t, uintptr_t));
     371                DECLCALLBACKMEMBER(int, pfn05,(uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t));
     372                DECLCALLBACKMEMBER(int, pfn06,(uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t));
     373                DECLCALLBACKMEMBER(int, pfn07,(uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t));
     374                DECLCALLBACKMEMBER(int, pfn08,(uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t));
     375                DECLCALLBACKMEMBER(int, pfn09,(uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t));
     376                DECLCALLBACKMEMBER(int, pfn10,(uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t));
     377                DECLCALLBACKMEMBER(int, pfn11,(uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t));
     378                DECLCALLBACKMEMBER(int, pfn12,(uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t));
    379379            } u;
    380380            u.pfn = pReq->u.Internal.pfn;

  • trunk/src/VBox/Runtime/common/misc/s3.cpp

    r82968 r85121  
    4343#endif
    4444#include <curl/curl.h>
     45#include "internal/openssl-pre.h"
    4546#include <openssl/hmac.h>
     47#include "internal/openssl-post.h"
    4648#include <libxml/parser.h>
    4749
    … …  
    285287}
    286288
    287 static size_t rtS3WriteNothingCallback(void *pvBuf, size_t cbItem, size_t cItems, void *pvUser)
     289static size_t rtS3WriteNothingCallback(void *pvBuf, size_t cbItem, size_t cItems, void *pvUser) RT_NOTHROW_DEF
    288290{
    289291    NOREF(pvBuf); NOREF(pvUser);
    … …  
    291293}
    292294
    293 static size_t rtS3WriteMemoryCallback(void *pvBuf, size_t cSize, size_t cBSize, void *pvUser)
     295static size_t rtS3WriteMemoryCallback(void *pvBuf, size_t cSize, size_t cBSize, void *pvUser) RT_NOTHROW_DEF
    294296{
    295297    PRTS3TMPMEMCHUNK pTmpMem = (PRTS3TMPMEMCHUNK)pvUser;
    … …  
    306308}
    307309
    308 static size_t rtS3WriteFileCallback(void *pvBuf, size_t cSize, size_t cBSize, void *pvUser)
     310static size_t rtS3WriteFileCallback(void *pvBuf, size_t cSize, size_t cBSize, void *pvUser) RT_NOTHROW_DEF
    309311{
    310312    size_t cWritten;
    … …  
    313315}
    314316
    315 static size_t rtS3ReadFileCallback(void *pvBuf, size_t cSize, size_t cBSize, void *pvUser)
     317static size_t rtS3ReadFileCallback(void *pvBuf, size_t cSize, size_t cBSize, void *pvUser) RT_NOTHROW_DEF
    316318{
    317319  size_t cRead;
    … …  
    321323}
    322324
    323 static int rtS3ProgressCallback(void *pvUser, double dDlTotal, double dDlNow, double dUlTotal, double dUlNow)
     325static int rtS3ProgressCallback(void *pvUser, double dDlTotal, double dDlNow, double dUlTotal, double dUlNow) RT_NOTHROW_DEF
    324326{
    325327    if (pvUser)

  • trunk/src/VBox/Runtime/common/path/RTPathGlob.cpp

    r83758 r85121  
    271271     *                      enumerating PATH items and similar.
    272272     */
    273     DECLCALLBACKMEMBER(int, pfnQuery)(uint32_t iItem, char *pszBuf, size_t cbBuf, size_t *pcchValue, PRTPATHMATCHCACHE pCache);
     273    DECLCALLBACKMEMBER(int, pfnQuery,(uint32_t iItem, char *pszBuf, size_t cbBuf, size_t *pcchValue, PRTPATHMATCHCACHE pCache));
    274274
    275275    /**
    … …  
    285285     * @param   pcchMatched Where to return the length of the match (value length).
    286286     */
    287     DECLCALLBACKMEMBER(int, pfnMatch)(const char *pchMatch, size_t cchMatch, bool fIgnoreCase, size_t *pcchMatched);
     287    DECLCALLBACKMEMBER(int, pfnMatch,(const char *pchMatch, size_t cchMatch, bool fIgnoreCase, size_t *pcchMatched));
    288288
    289289} RTPATHMATCHVAR;

  • trunk/src/VBox/Runtime/common/zip/zip.cpp

    r82968 r85121  
    132132     * @copydoc RTZipCompress
    133133     */
    134     DECLCALLBACKMEMBER(int, pfnCompress)(PRTZIPCOMP pZip, const void *pvBuf, size_t cbBuf);
     134    DECLCALLBACKMEMBER(int, pfnCompress,(PRTZIPCOMP pZip, const void *pvBuf, size_t cbBuf));
    135135
    136136    /**
    137137     * @copydoc RTZipCompFinish
    138138     */
    139     DECLCALLBACKMEMBER(int, pfnFinish)(PRTZIPCOMP pZip);
     139    DECLCALLBACKMEMBER(int, pfnFinish,(PRTZIPCOMP pZip));
    140140
    141141    /**
    142142     * @copydoc RTZipCompDestroy
    143143     */
    144     DECLCALLBACKMEMBER(int, pfnDestroy)(PRTZIPCOMP pZip);
     144    DECLCALLBACKMEMBER(int, pfnDestroy,(PRTZIPCOMP pZip));
    145145
    146146    /** Compression type. */
    … …  
    200200     * @copydoc RTZipDecompress
    201201     */
    202     DECLCALLBACKMEMBER(int, pfnDecompress)(PRTZIPDECOMP pZip, void *pvBuf, size_t cbBuf, size_t *pcbWritten);
     202    DECLCALLBACKMEMBER(int, pfnDecompress,(PRTZIPDECOMP pZip, void *pvBuf, size_t cbBuf, size_t *pcbWritten));
    203203
    204204    /**
    205205     * @copydoc RTZipDecompDestroy
    206206     */
    207     DECLCALLBACKMEMBER(int, pfnDestroy)(PRTZIPDECOMP pZip);
     207    DECLCALLBACKMEMBER(int, pfnDestroy,(PRTZIPDECOMP pZip));
    208208
    209209    /** Compression type. */

  • trunk/src/VBox/Runtime/generic/env-generic.cpp

    r82968 r85121  
    121121
    122122    /** The compare function we're using. */
    123     DECLCALLBACKMEMBER(int, pfnCompare)(const char *psz1, const char *psz2, size_t cchMax);
     123    DECLCALLBACKMEMBER(int, pfnCompare,(const char *psz1, const char *psz2, size_t cchMax));
    124124} RTENVINTERNAL, *PRTENVINTERNAL;
    125125

  • trunk/src/VBox/Runtime/generic/ftp-server.cpp

    r84509 r85121  
    268268
    269269/** Function pointer declaration for a specific FTP server command handler. */
    270 typedef DECLCALLBACK(int) FNRTFTPSERVERCMD(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs);
     270typedef DECLCALLBACKTYPE(int, FNRTFTPSERVERCMD,(PRTFTPSERVERCLIENT pClient, uint8_t cArgs, const char * const *apcszArgs));
    271271/** Pointer to a FNRTFTPSERVERCMD(). */
    272272typedef FNRTFTPSERVERCMD *PFNRTFTPSERVERCMD;

  • trunk/src/VBox/Runtime/generic/http-curl.cpp

    r85000 r85121  
    28602860 * cURL callback for reporting progress, we use it for checking for abort.
    28612861 */
    2862 static int rtHttpProgress(void *pData, double rdTotalDownload, double rdDownloaded, double rdTotalUpload, double rdUploaded)
     2862static int rtHttpProgress(void *pData, double rdTotalDownload, double rdDownloaded, double rdTotalUpload, double rdUploaded) RT_NOTHROW_DEF
    28632863{
    28642864    PRTHTTPINTERNAL pThis = (PRTHTTPINTERNAL)pData;
    … …  
    30823082 * cURL callback for writing body data.
    30833083 */
    3084 static size_t rtHttpWriteBodyData(char *pchBuf, size_t cbUnit, size_t cUnits, void *pvUser)
     3084static size_t rtHttpWriteBodyData(char *pchBuf, size_t cbUnit, size_t cUnits, void *pvUser) RT_NOTHROW_DEF
    30853085{
    30863086    PRTHTTPINTERNAL   pThis      = (PRTHTTPINTERNAL)pvUser;

  • trunk/src/VBox/Runtime/include/internal/dbgmod.h

    r83084 r85121  
    8181     * @param   fLdrFlags   Extra loader flags (RTLDR_O_XXX).
    8282     */
    83     DECLCALLBACKMEMBER(int, pfnTryOpen)(PRTDBGMODINT pMod, RTLDRARCH enmArch, uint32_t fLdrFlags);
     83    DECLCALLBACKMEMBER(int, pfnTryOpen,(PRTDBGMODINT pMod, RTLDRARCH enmArch, uint32_t fLdrFlags));
    8484
    8585    /**
    … …  
    9191     * @param   pMod        Pointer to the module structure.
    9292     */
    93     DECLCALLBACKMEMBER(int, pfnClose)(PRTDBGMODINT pMod);
     93    DECLCALLBACKMEMBER(int, pfnClose,(PRTDBGMODINT pMod));
    9494
    9595    /**
    … …  
    105105     * @param   pvUser          The user argument.
    106106     */
    107     DECLCALLBACKMEMBER(int, pfnEnumDbgInfo)(PRTDBGMODINT pMod, PFNRTLDRENUMDBG pfnCallback, void *pvUser);
     107    DECLCALLBACKMEMBER(int, pfnEnumDbgInfo,(PRTDBGMODINT pMod, PFNRTLDRENUMDBG pfnCallback, void *pvUser));
    108108
    109109    /**
    … …  
    119119     * @param   pvUser          The user argument.
    120120     */
    121     DECLCALLBACKMEMBER(int, pfnEnumSegments)(PRTDBGMODINT pMod, PFNRTLDRENUMSEGS pfnCallback, void *pvUser);
     121    DECLCALLBACKMEMBER(int, pfnEnumSegments,(PRTDBGMODINT pMod, PFNRTLDRENUMSEGS pfnCallback, void *pvUser));
    122122
    123123    /**
    … …  
    133133     * @param   pvUser          User argument to pass to the enumerator.
    134134     */
    135     DECLCALLBACKMEMBER(int, pfnEnumSymbols)(PRTDBGMODINT pMod, uint32_t fFlags, RTLDRADDR BaseAddress,
    136                                             PFNRTLDRENUMSYMS pfnCallback, void *pvUser);
     135    DECLCALLBACKMEMBER(int, pfnEnumSymbols,(PRTDBGMODINT pMod, uint32_t fFlags, RTLDRADDR BaseAddress,
     136                                            PFNRTLDRENUMSYMS pfnCallback, void *pvUser));
    137137
    138138    /**
    … …  
    145145     * @param   pMod            Pointer to the module structure.
    146146     */
    147     DECLCALLBACKMEMBER(RTUINTPTR, pfnImageSize)(PRTDBGMODINT pMod);
     147    DECLCALLBACKMEMBER(RTUINTPTR, pfnImageSize,(PRTDBGMODINT pMod));
    148148
    149149    /**
    … …  
    157157     * @param   poffSeg         Where to return the segment offset.
    158158     */
    159     DECLCALLBACKMEMBER(int, pfnLinkAddressToSegOffset)(PRTDBGMODINT pMod, RTLDRADDR LinkAddress,
    160                                                        PRTDBGSEGIDX piSeg, PRTLDRADDR poffSeg);
     159    DECLCALLBACKMEMBER(int, pfnLinkAddressToSegOffset,(PRTDBGMODINT pMod, RTLDRADDR LinkAddress,
     160                                                       PRTDBGSEGIDX piSeg, PRTLDRADDR poffSeg));
    161161
    162162    /**
    … …  
    170170     * @param   poffSeg         Where to return the segment offset.
    171171     */
    172     DECLCALLBACKMEMBER(int, pfnRvaToSegOffset)(PRTDBGMODINT pMod, RTLDRADDR Rva, uint32_t *piSeg, PRTLDRADDR poffSeg);
     172    DECLCALLBACKMEMBER(int, pfnRvaToSegOffset,(PRTDBGMODINT pMod, RTLDRADDR Rva, uint32_t *piSeg, PRTLDRADDR poffSeg));
    173173
    174174    /**
    … …  
    187187     * @remarks Fixups will only be applied if @a iDbgInfo is specified.
    188188     */
    189     DECLCALLBACKMEMBER(int, pfnMapPart)(PRTDBGMODINT pMod, uint32_t iDbgInfo, RTFOFF off, size_t cb, void const **ppvMap);
     189    DECLCALLBACKMEMBER(int, pfnMapPart,(PRTDBGMODINT pMod, uint32_t iDbgInfo, RTFOFF off, size_t cb, void const **ppvMap));
    190190
    191191    /**
    … …  
    199199     *                          successful return.
    200200     */
    201     DECLCALLBACKMEMBER(int, pfnUnmapPart)(PRTDBGMODINT pMod, size_t cb, void const **ppvMap);
     201    DECLCALLBACKMEMBER(int, pfnUnmapPart,(PRTDBGMODINT pMod, size_t cb, void const **ppvMap));
    202202
    203203    /**
    … …  
    213213     * @param   cb              The number of bytes to read.
    214214     */
    215     DECLCALLBACKMEMBER(int, pfnReadAt)(PRTDBGMODINT pMod, uint32_t iDbgInfoHint, RTFOFF off, void *pvBuf, size_t cb);
     215    DECLCALLBACKMEMBER(int, pfnReadAt,(PRTDBGMODINT pMod, uint32_t iDbgInfoHint, RTFOFF off, void *pvBuf, size_t cb));
    216216
    217217    /**
    … …  
    221221     * @param   pMod            Pointer to the module structure.
    222222     */
    223     DECLCALLBACKMEMBER(RTLDRFMT, pfnGetFormat)(PRTDBGMODINT pMod);
     223    DECLCALLBACKMEMBER(RTLDRFMT, pfnGetFormat,(PRTDBGMODINT pMod));
    224224
    225225    /**
    … …  
    230230     * @param   pMod            Pointer to the module structure.
    231231     */
    232     DECLCALLBACKMEMBER(RTLDRARCH, pfnGetArch)(PRTDBGMODINT pMod);
     232    DECLCALLBACKMEMBER(RTLDRARCH, pfnGetArch,(PRTDBGMODINT pMod));
    233233
    234234    /**
    … …  
    245245     * @sa      RTLdrQueryPropEx
    246246     */
    247     DECLCALLBACKMEMBER(int, pfnQueryProp)(PRTDBGMODINT pMod, RTLDRPROP enmProp, void *pvBuf, size_t cbBuf, size_t *pcbRet);
     247    DECLCALLBACKMEMBER(int, pfnQueryProp,(PRTDBGMODINT pMod, RTLDRPROP enmProp, void *pvBuf, size_t cbBuf, size_t *pcbRet));
    248248
    249249    /**
    … …  
    264264     * @sa      RTLdrUnwindFrame, RTDbgModUnwindFrame
    265265     */
    266     DECLCALLBACKMEMBER(int, pfnUnwindFrame)(PRTDBGMODINT pMod, RTDBGSEGIDX iSeg, RTUINTPTR off, PRTDBGUNWINDSTATE pState);
     266    DECLCALLBACKMEMBER(int, pfnUnwindFrame,(PRTDBGMODINT pMod, RTDBGSEGIDX iSeg, RTUINTPTR off, PRTDBGUNWINDSTATE pState));
    267267
    268268    /** For catching initialization errors (RTDBGMODVTIMG_MAGIC). */
    … …  
    307307     * @param   enmArch     The desired architecture.
    308308     */
    309     DECLCALLBACKMEMBER(int, pfnTryOpen)(PRTDBGMODINT pMod, RTLDRARCH enmArch);
     309    DECLCALLBACKMEMBER(int, pfnTryOpen,(PRTDBGMODINT pMod, RTLDRARCH enmArch));
    310310
    311311    /**
    … …  
    317317     * @param   pMod        Pointer to the module structure.
    318318     */
    319     DECLCALLBACKMEMBER(int, pfnClose)(PRTDBGMODINT pMod);
     319    DECLCALLBACKMEMBER(int, pfnClose,(PRTDBGMODINT pMod));
    320320
    321321
    … …  
    329329     * @param   poffSeg     Where to return the segment offset. Optional.
    330330     */
    331     DECLCALLBACKMEMBER(RTDBGSEGIDX, pfnRvaToSegOff)(PRTDBGMODINT pMod, RTUINTPTR uRva, PRTUINTPTR poffSeg);
     331    DECLCALLBACKMEMBER(RTDBGSEGIDX, pfnRvaToSegOff,(PRTDBGMODINT pMod, RTUINTPTR uRva, PRTUINTPTR poffSeg));
    332332
    333333    /**
    … …  
    340340     * @param   pMod        Pointer to the module structure.
    341341     */
    342     DECLCALLBACKMEMBER(RTUINTPTR, pfnImageSize)(PRTDBGMODINT pMod);
     342    DECLCALLBACKMEMBER(RTUINTPTR, pfnImageSize,(PRTDBGMODINT pMod));
    343343
    344344
    … …  
    361361     *                      Optional.
    362362     */
    363     DECLCALLBACKMEMBER(int, pfnSegmentAdd)(PRTDBGMODINT pMod, RTUINTPTR uRva, RTUINTPTR cb, const char *pszName, size_t cchName,
    364                                            uint32_t fFlags, PRTDBGSEGIDX piSeg);
     363    DECLCALLBACKMEMBER(int, pfnSegmentAdd,(PRTDBGMODINT pMod, RTUINTPTR uRva, RTUINTPTR cb, const char *pszName, size_t cchName,
     364                                           uint32_t fFlags, PRTDBGSEGIDX piSeg));
    365365
    366366    /**
    … …  
    372372     * @param   pMod        Pointer to the module structure.
    373373     */
    374     DECLCALLBACKMEMBER(RTDBGSEGIDX, pfnSegmentCount)(PRTDBGMODINT pMod);
     374    DECLCALLBACKMEMBER(RTDBGSEGIDX, pfnSegmentCount,(PRTDBGMODINT pMod));
    375375
    376376    /**
    … …  
    384384     * @param   pSegInfo    Where to store the segment information.
    385385     */
    386     DECLCALLBACKMEMBER(int, pfnSegmentByIndex)(PRTDBGMODINT pMod, RTDBGSEGIDX iSeg, PRTDBGSEGMENT pSegInfo);
     386    DECLCALLBACKMEMBER(int, pfnSegmentByIndex,(PRTDBGMODINT pMod, RTDBGSEGIDX iSeg, PRTDBGSEGMENT pSegInfo));
    387387
    388388
    … …  
    405405     *                      UINT32_MAX. Optional
    406406     */
    407     DECLCALLBACKMEMBER(int, pfnSymbolAdd)(PRTDBGMODINT pMod, const char *pszSymbol, size_t cchSymbol,
     407    DECLCALLBACKMEMBER(int, pfnSymbolAdd,(PRTDBGMODINT pMod, const char *pszSymbol, size_t cchSymbol,
    408408                                          uint32_t iSeg, RTUINTPTR off, RTUINTPTR cb, uint32_t fFlags,
    409                                           uint32_t *piOrdinal);
     409                                          uint32_t *piOrdinal));
    410410
    411411    /**
    … …  
    419419     * @param   pMod        Pointer to the module structure.
    420420     */
    421     DECLCALLBACKMEMBER(uint32_t, pfnSymbolCount)(PRTDBGMODINT pMod);
     421    DECLCALLBACKMEMBER(uint32_t, pfnSymbolCount,(PRTDBGMODINT pMod));
    422422
    423423    /**
    … …  
    434434     * @param   pSymInfo    Where to store the symbol information.
    435435     */
    436     DECLCALLBACKMEMBER(int, pfnSymbolByOrdinal)(PRTDBGMODINT pMod, uint32_t iOrdinal, PRTDBGSYMBOL pSymInfo);
     436    DECLCALLBACKMEMBER(int, pfnSymbolByOrdinal,(PRTDBGMODINT pMod, uint32_t iOrdinal, PRTDBGSYMBOL pSymInfo));
    437437
    438438    /**
    … …  
    449449     * @param   pSymInfo    Where to store the symbol information.
    450450     */
    451     DECLCALLBACKMEMBER(int, pfnSymbolByName)(PRTDBGMODINT pMod, const char *pszSymbol, size_t cchSymbol, PRTDBGSYMBOL pSymInfo);
     451    DECLCALLBACKMEMBER(int, pfnSymbolByName,(PRTDBGMODINT pMod, const char *pszSymbol, size_t cchSymbol, PRTDBGSYMBOL pSymInfo));
    452452
    453453    /**
    … …  
    471471     * @param   pSymInfo    Where to store the symbol information.
    472472     */
    473     DECLCALLBACKMEMBER(int, pfnSymbolByAddr)(PRTDBGMODINT pMod, uint32_t iSeg, RTUINTPTR off, uint32_t fFlags,
    474                                              PRTINTPTR poffDisp, PRTDBGSYMBOL pSymInfo);
     473    DECLCALLBACKMEMBER(int, pfnSymbolByAddr,(PRTDBGMODINT pMod, uint32_t iSeg, RTUINTPTR off, uint32_t fFlags,
     474                                             PRTINTPTR poffDisp, PRTDBGSYMBOL pSymInfo));
    475475
    476476
    … …  
    492492     *                      UINT32_MAX. Optional
    493493     */
    494     DECLCALLBACKMEMBER(int, pfnLineAdd)(PRTDBGMODINT pMod, const char *pszFile, size_t cchFile, uint32_t uLineNo,
    495                                         uint32_t iSeg, RTUINTPTR off, uint32_t *piOrdinal);
     494    DECLCALLBACKMEMBER(int, pfnLineAdd,(PRTDBGMODINT pMod, const char *pszFile, size_t cchFile, uint32_t uLineNo,
     495                                        uint32_t iSeg, RTUINTPTR off, uint32_t *piOrdinal));
    496496
    497497    /**
    … …  
    502502     * @param   pMod        Pointer to the module structure.
    503503     */
    504     DECLCALLBACKMEMBER(uint32_t, pfnLineCount)(PRTDBGMODINT pMod);
     504    DECLCALLBACKMEMBER(uint32_t, pfnLineCount,(PRTDBGMODINT pMod));
    505505
    506506    /**
    … …  
    517517     * @param   pLineInfo   Where to store the information about the line number.
    518518     */
    519     DECLCALLBACKMEMBER(int, pfnLineByOrdinal)(PRTDBGMODINT pMod, uint32_t iOrdinal, PRTDBGLINE pLineInfo);
     519    DECLCALLBACKMEMBER(int, pfnLineByOrdinal,(PRTDBGMODINT pMod, uint32_t iOrdinal, PRTDBGLINE pLineInfo));
    520520
    521521    /**
    … …  
    535535     *                      number.
    536536     */
    537     DECLCALLBACKMEMBER(int, pfnLineByAddr)(PRTDBGMODINT pMod, uint32_t iSeg, RTUINTPTR off,
    538                                            PRTINTPTR poffDisp, PRTDBGLINE pLineInfo);
     537    DECLCALLBACKMEMBER(int, pfnLineByAddr,(PRTDBGMODINT pMod, uint32_t iSeg, RTUINTPTR off,
     538                                           PRTINTPTR poffDisp, PRTDBGLINE pLineInfo));
    539539
    540540    /**
    … …  
    555555     * @sa      RTDbgModUnwindFrame
    556556     */
    557     DECLCALLBACKMEMBER(int, pfnUnwindFrame)(PRTDBGMODINT pMod, RTDBGSEGIDX iSeg, RTUINTPTR off, PRTDBGUNWINDSTATE pState);
     557    DECLCALLBACKMEMBER(int, pfnUnwindFrame,(PRTDBGMODINT pMod, RTDBGSEGIDX iSeg, RTUINTPTR off, PRTDBGUNWINDSTATE pState));
    558558
    559559    /** For catching initialization errors (RTDBGMODVTDBG_MAGIC). */
    … …  
    572572 * @param   pDeferred       The deferred load data.
    573573 */
    574 typedef DECLCALLBACK(int) FNRTDBGMODDEFERRED(PRTDBGMODINT pDbgMod, struct RTDBGMODDEFERRED *pDeferred);
     574typedef DECLCALLBACKTYPE(int, FNRTDBGMODDEFERRED,(PRTDBGMODINT pDbgMod, struct RTDBGMODDEFERRED *pDeferred));
    575575/** Pointer to a deferred loading callback. */
    576576typedef FNRTDBGMODDEFERRED *PFNRTDBGMODDEFERRED;

  • trunk/src/VBox/Runtime/include/internal/dir.h

    r82968 r85121  
    4747 * @param   pszName     The path to match to the filter.
    4848 */
    49 typedef DECLCALLBACK(bool) FNRTDIRFILTER(PRTDIRINTERNAL pDir, const char *pszName);
     49typedef DECLCALLBACKTYPE(bool, FNRTDIRFILTER,(PRTDIRINTERNAL pDir, const char *pszName));
    5050/** Pointer to a filter function. */
    5151typedef FNRTDIRFILTER *PFNRTDIRFILTER;

  • trunk/src/VBox/Runtime/include/internal/dvm.h

    r82968 r85121  
    9595     * @param   puScore         Where to store the match score on success.
    9696     */
    97     DECLCALLBACKMEMBER(int, pfnProbe)(PCRTDVMDISK pDisk, uint32_t *puScore);
     97    DECLCALLBACKMEMBER(int, pfnProbe,(PCRTDVMDISK pDisk, uint32_t *puScore));
    9898
    9999    /**
    … …  
    104104     * @param   phVolMgrFmt     Where to store the volume format data on success.
    105105     */
    106     DECLCALLBACKMEMBER(int, pfnOpen)(PCRTDVMDISK pDisk, PRTDVMFMT phVolMgrFmt);
     106    DECLCALLBACKMEMBER(int, pfnOpen,(PCRTDVMDISK pDisk, PRTDVMFMT phVolMgrFmt));
    107107
    108108    /**
    … …  
    113113     * @param   phVolMgrFmt     Where to store the volume format data on success.
    114114     */
    115     DECLCALLBACKMEMBER(int, pfnInitialize)(PCRTDVMDISK pDisk, PRTDVMFMT phVolMgrFmt);
     115    DECLCALLBACKMEMBER(int, pfnInitialize,(PCRTDVMDISK pDisk, PRTDVMFMT phVolMgrFmt));
    116116
    117117    /**
    … …  
    121121     * @param   hVolMgrFmt      The format specific volume manager handle.
    122122     */
    123     DECLCALLBACKMEMBER(void, pfnClose)(RTDVMFMT hVolMgrFmt);
     123    DECLCALLBACKMEMBER(void, pfnClose,(RTDVMFMT hVolMgrFmt));
    124124
    125125    /**
    … …  
    133133     *                          volume manager.
    134134     */
    135     DECLCALLBACKMEMBER(int, pfnQueryRangeUse)(RTDVMFMT hVolMgrFmt,
     135    DECLCALLBACKMEMBER(int, pfnQueryRangeUse,(RTDVMFMT hVolMgrFmt,
    136136                                              uint64_t off, uint64_t cbRange,
    137                                               bool *pfUsed);
     137                                              bool *pfUsed));
    138138
    139139    /**
    … …  
    143143     * @param   hVolMgrFmt      The format specific volume manager handle.
    144144     */
    145     DECLCALLBACKMEMBER(uint32_t, pfnGetValidVolumes)(RTDVMFMT hVolMgrFmt);
     145    DECLCALLBACKMEMBER(uint32_t, pfnGetValidVolumes,(RTDVMFMT hVolMgrFmt));
    146146
    147147    /**
    … …  
    151151     * @param   hVolMgrFmt      The format specific volume manager handle.
    152152     */
    153     DECLCALLBACKMEMBER(uint32_t, pfnGetMaxVolumes)(RTDVMFMT hVolMgrFmt);
     153    DECLCALLBACKMEMBER(uint32_t, pfnGetMaxVolumes,(RTDVMFMT hVolMgrFmt));
    154154
    155155    /**
    … …  
    161161     *                          on success.
    162162     */
    163     DECLCALLBACKMEMBER(int, pfnQueryFirstVolume)(RTDVMFMT hVolMgrFmt, PRTDVMVOLUMEFMT phVolFmt);
     163    DECLCALLBACKMEMBER(int, pfnQueryFirstVolume,(RTDVMFMT hVolMgrFmt, PRTDVMVOLUMEFMT phVolFmt));
    164164
    165165    /**
    … …  
    172172     *                          volume data of the next volume on success.
    173173     */
    174     DECLCALLBACKMEMBER(int, pfnQueryNextVolume)(RTDVMFMT hVolMgrFmt, RTDVMVOLUMEFMT hVolFmt, PRTDVMVOLUMEFMT phVolFmtNext);
     174    DECLCALLBACKMEMBER(int, pfnQueryNextVolume,(RTDVMFMT hVolMgrFmt, RTDVMVOLUMEFMT hVolFmt, PRTDVMVOLUMEFMT phVolFmtNext));
    175175
    176176    /**
    … …  
    180180     * @param   hVolFmt         The format specific volume handle.
    181181     */
    182     DECLCALLBACKMEMBER(void, pfnVolumeClose)(RTDVMVOLUMEFMT hVolFmt);
     182    DECLCALLBACKMEMBER(void, pfnVolumeClose,(RTDVMVOLUMEFMT hVolFmt));
    183183
    184184    /**
    … …  
    188188     * @param   hVolFmt         The format specific volume handle.
    189189     */
    190     DECLCALLBACKMEMBER(uint64_t, pfnVolumeGetSize)(RTDVMVOLUMEFMT hVolFmt);
     190    DECLCALLBACKMEMBER(uint64_t, pfnVolumeGetSize,(RTDVMVOLUMEFMT hVolFmt));
    191191
    192192    /**
    … …  
    197197     * @param   ppszVolname     Where to store the name of the volume on success.
    198198     */
    199     DECLCALLBACKMEMBER(int, pfnVolumeQueryName)(RTDVMVOLUMEFMT hVolFmt, char **ppszVolName);
     199    DECLCALLBACKMEMBER(int, pfnVolumeQueryName,(RTDVMVOLUMEFMT hVolFmt, char **ppszVolName));
    200200
    201201    /**
    … …  
    205205     * @param   hVolFmt         The format specific volume handle.
    206206     */
    207     DECLCALLBACKMEMBER(RTDVMVOLTYPE, pfnVolumeGetType)(RTDVMVOLUMEFMT hVolFmt);
     207    DECLCALLBACKMEMBER(RTDVMVOLTYPE, pfnVolumeGetType,(RTDVMVOLUMEFMT hVolFmt));
    208208
    209209    /**
    … …  
    213213     * @param   hVolFmt         The format specific volume handle.
    214214     */
    215     DECLCALLBACKMEMBER(uint64_t, pfnVolumeGetFlags)(RTDVMVOLUMEFMT hVolFmt);
     215    DECLCALLBACKMEMBER(uint64_t, pfnVolumeGetFlags,(RTDVMVOLUMEFMT hVolFmt));
    216216
    217217    /**
    … …  
    225225     *                          underlying medium (inclusive).
    226226     */
    227     DECLCALLBACKMEMBER(int, pfnVolumeQueryRange)(RTDVMVOLUMEFMT hVolFmt, uint64_t *poffStart, uint64_t *poffLast);
     227    DECLCALLBACKMEMBER(int, pfnVolumeQueryRange,(RTDVMVOLUMEFMT hVolFmt, uint64_t *poffStart, uint64_t *poffLast));
    228228
    229229    /**
    … …  
    240240     *                          with the range if true is returned.
    241241     */
    242     DECLCALLBACKMEMBER(bool, pfnVolumeIsRangeIntersecting)(RTDVMVOLUMEFMT hVolFmt,
     242    DECLCALLBACKMEMBER(bool, pfnVolumeIsRangeIntersecting,(RTDVMVOLUMEFMT hVolFmt,
    243243                                                           uint64_t offStart, size_t cbRange,
    244244                                                           uint64_t *poffVol,
    245                                                            uint64_t *pcbIntersect);
     245                                                           uint64_t *pcbIntersect));
    246246
    247247    /**
    … …  
    254254     * @param   cbRead          How many bytes to read.
    255255     */
    256     DECLCALLBACKMEMBER(int, pfnVolumeRead)(RTDVMVOLUMEFMT hVolFmt, uint64_t off, void *pvBuf, size_t cbRead);
     256    DECLCALLBACKMEMBER(int, pfnVolumeRead,(RTDVMVOLUMEFMT hVolFmt, uint64_t off, void *pvBuf, size_t cbRead));
    257257
    258258    /**
    … …  
    265265     * @param   cbWrite         How many bytes to write.
    266266     */
    267     DECLCALLBACKMEMBER(int, pfnVolumeWrite)(RTDVMVOLUMEFMT hVolFmt, uint64_t off, const void *pvBuf, size_t cbWrite);
     267    DECLCALLBACKMEMBER(int, pfnVolumeWrite,(RTDVMVOLUMEFMT hVolFmt, uint64_t off, const void *pvBuf, size_t cbWrite));
    268268
    269269} RTDVMFMTOPS;

  • trunk/src/VBox/Runtime/include/internal/ldr.h

    r82968 r85121  
    242242     * @remark  Compulsory entry point.
    243243     */
    244     DECLCALLBACKMEMBER(int, pfnClose)(PRTLDRMODINTERNAL pMod);
     244    DECLCALLBACKMEMBER(int, pfnClose,(PRTLDRMODINTERNAL pMod));
    245245
    246246    /**
    … …  
    253253     * @param   ppvValue    Where to store the symbol value.
    254254     */
    255     DECLCALLBACKMEMBER(int, pfnGetSymbol)(PRTLDRMODINTERNAL pMod, const char *pszSymbol, void **ppvValue);
     255    DECLCALLBACKMEMBER(int, pfnGetSymbol,(PRTLDRMODINTERNAL pMod, const char *pszSymbol, void **ppvValue));
    256256
    257257    /**
    … …  
    265265     * @remark  This is an optional entry point.
    266266     */
    267     DECLCALLBACKMEMBER(int, pfnDone)(PRTLDRMODINTERNAL pMod);
     267    DECLCALLBACKMEMBER(int, pfnDone,(PRTLDRMODINTERNAL pMod));
    268268
    269269    /**
    … …  
    280280     * @remark  This is an optional entry point.
    281281     */
    282     DECLCALLBACKMEMBER(int, pfnEnumSymbols)(PRTLDRMODINTERNAL pMod, unsigned fFlags, const void *pvBits, RTUINTPTR BaseAddress,
    283                                             PFNRTLDRENUMSYMS pfnCallback, void *pvUser);
     282    DECLCALLBACKMEMBER(int, pfnEnumSymbols,(PRTLDRMODINTERNAL pMod, unsigned fFlags, const void *pvBits, RTUINTPTR BaseAddress,
     283                                            PFNRTLDRENUMSYMS pfnCallback, void *pvUser));
    284284
    285285
    … …  
    294294     * @remark  Extended loader feature.
    295295     */
    296     DECLCALLBACKMEMBER(size_t, pfnGetImageSize)(PRTLDRMODINTERNAL pMod);
     296    DECLCALLBACKMEMBER(size_t, pfnGetImageSize,(PRTLDRMODINTERNAL pMod));
    297297
    298298    /**
    … …  
    308308     * @remark  Extended loader feature.
    309309     */
    310     DECLCALLBACKMEMBER(int, pfnGetBits)(PRTLDRMODINTERNAL pMod, void *pvBits, RTUINTPTR BaseAddress, PFNRTLDRIMPORT pfnGetImport, void *pvUser);
     310    DECLCALLBACKMEMBER(int, pfnGetBits,(PRTLDRMODINTERNAL pMod, void *pvBits, RTUINTPTR BaseAddress, PFNRTLDRIMPORT pfnGetImport, void *pvUser));
    311311
    312312    /**
    … …  
    323323     * @remark  Extended loader feature.
    324324     */
    325     DECLCALLBACKMEMBER(int, pfnRelocate)(PRTLDRMODINTERNAL pMod, void *pvBits, RTUINTPTR NewBaseAddress, RTUINTPTR OldBaseAddress, PFNRTLDRIMPORT pfnGetImport, void *pvUser);
     325    DECLCALLBACKMEMBER(int, pfnRelocate,(PRTLDRMODINTERNAL pMod, void *pvBits, RTUINTPTR NewBaseAddress, RTUINTPTR OldBaseAddress, PFNRTLDRIMPORT pfnGetImport, void *pvUser));
    326326
    327327    /**
    … …  
    341341     * @remark  Extended loader feature.
    342342     */
    343     DECLCALLBACKMEMBER(int, pfnGetSymbolEx)(PRTLDRMODINTERNAL pMod, const void *pvBits, RTUINTPTR BaseAddress,
    344                                             uint32_t iOrdinal, const char *pszSymbol, RTUINTPTR *pValue);
     343    DECLCALLBACKMEMBER(int, pfnGetSymbolEx,(PRTLDRMODINTERNAL pMod, const void *pvBits, RTUINTPTR BaseAddress,
     344                                            uint32_t iOrdinal, const char *pszSymbol, RTUINTPTR *pValue));
    345345
    346346    /**
    … …  
    362362     * @remark  Extended loader feature.
    363363     */
    364     DECLCALLBACKMEMBER(int, pfnQueryForwarderInfo)(PRTLDRMODINTERNAL pMod, const void *pvBits, uint32_t iOrdinal,
    365                                                    const char *pszSymbol, PRTLDRIMPORTINFO pInfo, size_t cbInfo);
     364    DECLCALLBACKMEMBER(int, pfnQueryForwarderInfo,(PRTLDRMODINTERNAL pMod, const void *pvBits, uint32_t iOrdinal,
     365                                                   const char *pszSymbol, PRTLDRIMPORTINFO pInfo, size_t cbInfo));
    366366
    367367    /**
    … …  
    376376     * @remark  This is an optional entry point that can be NULL.
    377377     */
    378     DECLCALLBACKMEMBER(int, pfnEnumDbgInfo)(PRTLDRMODINTERNAL pMod, const void *pvBits,
    379                                             PFNRTLDRENUMDBG pfnCallback, void *pvUser);
     378    DECLCALLBACKMEMBER(int, pfnEnumDbgInfo,(PRTLDRMODINTERNAL pMod, const void *pvBits,
     379                                            PFNRTLDRENUMDBG pfnCallback, void *pvUser));
    380380
    381381    /**
    … …  
    389389     * @remark  This is an optional entry point that can be NULL.
    390390     */
    391     DECLCALLBACKMEMBER(int, pfnEnumSegments)(PRTLDRMODINTERNAL pMod, PFNRTLDRENUMSEGS pfnCallback, void *pvUser);
     391    DECLCALLBACKMEMBER(int, pfnEnumSegments,(PRTLDRMODINTERNAL pMod, PFNRTLDRENUMSEGS pfnCallback, void *pvUser));
    392392
    393393    /**
    … …  
    402402     * @remark  This is an optional entry point that can be NULL.
    403403     */
    404     DECLCALLBACKMEMBER(int, pfnLinkAddressToSegOffset)(PRTLDRMODINTERNAL pMod, RTLDRADDR LinkAddress,
    405                                                        uint32_t *piSeg, PRTLDRADDR poffSeg);
     404    DECLCALLBACKMEMBER(int, pfnLinkAddressToSegOffset,(PRTLDRMODINTERNAL pMod, RTLDRADDR LinkAddress,
     405                                                       uint32_t *piSeg, PRTLDRADDR poffSeg));
    406406
    407407    /**
    … …  
    415415     * @remark  This is an optional entry point that can be NULL.
    416416     */
    417     DECLCALLBACKMEMBER(int, pfnLinkAddressToRva)(PRTLDRMODINTERNAL pMod, RTLDRADDR LinkAddress, PRTLDRADDR pRva);
     417    DECLCALLBACKMEMBER(int, pfnLinkAddressToRva,(PRTLDRMODINTERNAL pMod, RTLDRADDR LinkAddress, PRTLDRADDR pRva));
    418418
    419419    /**
    … …  
    428428     * @remark  This is an optional entry point that can be NULL.
    429429     */
    430     DECLCALLBACKMEMBER(int, pfnSegOffsetToRva)(PRTLDRMODINTERNAL pMod, uint32_t iSeg, RTLDRADDR offSeg, PRTLDRADDR pRva);
     430    DECLCALLBACKMEMBER(int, pfnSegOffsetToRva,(PRTLDRMODINTERNAL pMod, uint32_t iSeg, RTLDRADDR offSeg, PRTLDRADDR pRva));
    431431
    432432    /**
    … …  
    441441     * @remark  This is an optional entry point that can be NULL.
    442442     */
    443     DECLCALLBACKMEMBER(int, pfnRvaToSegOffset)(PRTLDRMODINTERNAL pMod, RTLDRADDR Rva, uint32_t *piSeg, PRTLDRADDR poffSeg);
     443    DECLCALLBACKMEMBER(int, pfnRvaToSegOffset,(PRTLDRMODINTERNAL pMod, RTLDRADDR Rva, uint32_t *piSeg, PRTLDRADDR poffSeg));
    444444
    445445    /**
    … …  
    460460     * @param   pMod            Pointer to the loader module structure.
    461461     */
    462     DECLCALLBACKMEMBER(int, pfnReadDbgInfo)(PRTLDRMODINTERNAL pMod, uint32_t iDbgInfo, RTFOFF off, size_t cb, void *pvBuf);
     462    DECLCALLBACKMEMBER(int, pfnReadDbgInfo,(PRTLDRMODINTERNAL pMod, uint32_t iDbgInfo, RTFOFF off, size_t cb, void *pvBuf));
    463463
    464464    /**
    … …  
    483483     *                          required buffer size.
    484484     */
    485     DECLCALLBACKMEMBER(int, pfnQueryProp)(PRTLDRMODINTERNAL pMod, RTLDRPROP enmProp, void const *pvBits,
    486                                           void *pvBuf, size_t cbBuf, size_t *pcbRet);
     485    DECLCALLBACKMEMBER(int, pfnQueryProp,(PRTLDRMODINTERNAL pMod, RTLDRPROP enmProp, void const *pvBits,
     486                                          void *pvBuf, size_t cbBuf, size_t *pcbRet));
    487487
    488488    /**
    … …  
    501501     * @param   pErrInfo        Pointer to an error info buffer. Optional.
    502502     */
    503     DECLCALLBACKMEMBER(int, pfnVerifySignature)(PRTLDRMODINTERNAL pMod, PFNRTLDRVALIDATESIGNEDDATA pfnCallback, void *pvUser,
    504                                                 PRTERRINFO pErrInfo);
     503    DECLCALLBACKMEMBER(int, pfnVerifySignature,(PRTLDRMODINTERNAL pMod, PFNRTLDRVALIDATESIGNEDDATA pfnCallback, void *pvUser,
     504                                                PRTERRINFO pErrInfo));
    505505
    506506    /**
    … …  
    513513     * @param   cbDigest        Size of the buffer @a pszDigest points at.
    514514     */
    515     DECLCALLBACKMEMBER(int, pfnHashImage)(PRTLDRMODINTERNAL pMod, RTDIGESTTYPE enmDigest, char *pszDigest, size_t cbDigest);
     515    DECLCALLBACKMEMBER(int, pfnHashImage,(PRTLDRMODINTERNAL pMod, RTDIGESTTYPE enmDigest, char *pszDigest, size_t cbDigest));
    516516
    517517        /**
    … …  
    534534     * @sa      RTLdrUnwindFrame, RTDbgModUnwindFrame
    535535     */
    536     DECLCALLBACKMEMBER(int, pfnUnwindFrame)(PRTLDRMODINTERNAL pMod, void const *pvBits, uint32_t iSeg, RTUINTPTR off,
    537                                             PRTDBGUNWINDSTATE pState);
     536    DECLCALLBACKMEMBER(int, pfnUnwindFrame,(PRTLDRMODINTERNAL pMod, void const *pvBits, uint32_t iSeg, RTUINTPTR off,
     537                                            PRTDBGUNWINDSTATE pState));
    538538
    539539    /** Dummy entry to make sure we've initialized it all. */

  • trunk/src/VBox/Runtime/include/internal/rand.h

    r82968 r85121  
    5858     * @param   cb          The number of bytes to produce.
    5959     */
    60     DECLCALLBACKMEMBER(void ,    pfnGetBytes)(PRTRANDINT pThis, uint8_t *pb, size_t cb);
     60    DECLCALLBACKMEMBER(void , pfnGetBytes,(PRTRANDINT pThis, uint8_t *pb, size_t cb));
    6161
    6262    /**
    … …  
    6868     * @param   u32Last     The last number in the range (i.e. inclusive).
    6969     */
    70     DECLCALLBACKMEMBER(uint32_t, pfnGetU32)(PRTRANDINT pThis, uint32_t u32First, uint32_t u32Last);
     70    DECLCALLBACKMEMBER(uint32_t, pfnGetU32,(PRTRANDINT pThis, uint32_t u32First, uint32_t u32Last));
    7171
    7272    /**
    … …  
    7878     * @param   u64Last     The last number in the range (i.e. inclusive).
    7979     */
    80     DECLCALLBACKMEMBER(uint64_t, pfnGetU64)(PRTRANDINT pThis, uint64_t u64First, uint64_t u64Last);
     80    DECLCALLBACKMEMBER(uint64_t, pfnGetU64,(PRTRANDINT pThis, uint64_t u64First, uint64_t u64Last));
    8181
    8282    /**
    … …  
    8989     * @param   u64Seed     The seed.
    9090     */
    91     DECLCALLBACKMEMBER(int, pfnSeed)(PRTRANDINT pThis, uint64_t u64Seed);
     91    DECLCALLBACKMEMBER(int, pfnSeed,(PRTRANDINT pThis, uint64_t u64Seed));
    9292
    9393    /**
    … …  
    111111     *                      terminator, thus the 'cb' instead of 'cch').
    112112     */
    113     DECLCALLBACKMEMBER(int, pfnSaveState)(PRTRANDINT pThis, char *pszState, size_t *pcbState);
     113    DECLCALLBACKMEMBER(int, pfnSaveState,(PRTRANDINT pThis, char *pszState, size_t *pcbState));
    114114
    115115    /**
    … …  
    125125     * @param   pszState    The state to load.
    126126     */
    127     DECLCALLBACKMEMBER(int, pfnRestoreState)(PRTRANDINT pThis, char const *pszState);
     127    DECLCALLBACKMEMBER(int, pfnRestoreState,(PRTRANDINT pThis, char const *pszState));
    128128
    129129    /**
    … …  
    136136     * @param   pThis       Pointer to the instance data.
    137137     */
    138     DECLCALLBACKMEMBER(int, pfnDestroy)(PRTRANDINT pThis);
     138    DECLCALLBACKMEMBER(int, pfnDestroy,(PRTRANDINT pThis));
    139139
    140140    /** Union containing the specific state info for each generator. */

  • trunk/src/VBox/Runtime/r0drv/mp-r0drv.h

    r82968 r85121  
    4242 * @param   pvUser2     The second user argument.
    4343 */
    44 typedef DECLCALLBACK(void) FNMPWORKER(RTCPUID idCpu, void *pvUser1, void *pvUser2);
     44typedef DECLCALLBACKTYPE(void, FNMPWORKER,(RTCPUID idCpu, void *pvUser1, void *pvUser2));
    4545/** Pointer to a FNMPWORKER(). */
    4646typedef FNMPWORKER *PFNMPWORKER;

  • trunk/src/VBox/Runtime/r3/init.cpp

    r82968 r85121  
    151151 * termination callback chain.
    152152 */
    153 static void rtR3ExitCallback(void)
     153static void rtR3ExitCallback(void) RT_NOTHROW_DEF
    154154{
    155155    ASMAtomicWriteBool(&g_frtAtExitCalled, true);

  • trunk/src/VBox/Runtime/r3/win/internal-r3-win.h

    r82968 r85121  
    136136typedef int             (WINAPI *PFNWSAENUMNETWORKEVENTS)(UINT_PTR, HANDLE, struct _WSANETWORKEVENTS *);
    137137/** WSASend */
    138 typedef int             (WINAPI *PFNWSASend)(UINT_PTR, struct _WSABUF *, DWORD, LPDWORD, DWORD dwFlags, struct _OVERLAPPED *, PFNRT /*LPWSAOVERLAPPED_COMPLETION_ROUTINE*/);
     138typedef int             (WINAPI *PFNWSASend)(UINT_PTR, struct _WSABUF *, DWORD, LPDWORD, DWORD dwFlags, struct _OVERLAPPED *, uintptr_t /*LPWSAOVERLAPPED_COMPLETION_ROUTINE*/);
    139139
    140140/** socket */

  • trunk/src/VBox/Runtime/r3/win/process-win.cpp

    r82968 r85121  
    20762076            rc = RTErrConvertFromWin32(dwErr);
    20772077            if (rc == VERR_UNRESOLVED_ERROR)
    2078                 LogRelFunc(("CreateProcessWithLogonW (%p) failed: dwErr=%u (%#x), rc=%Rrc\n",
    2079                             g_pfnCreateProcessWithLogonW, dwErr, dwErr, rc));
     2078                LogRelFunc(("CreateProcessWithLogonW failed: dwErr=%u (%#x), rc=%Rrc\n", dwErr, dwErr, rc));
    20802079        }
    20812080        if (pwszzBlock)

  • trunk/src/VBox/Runtime/r3/win/thread-win.cpp

    r84840 r85121  
    5959*   Internal Functions                                                                                                           *
    6060*********************************************************************************************************************************/
    61 static unsigned __stdcall rtThreadNativeMain(void *pvArgs);
     61static unsigned __stdcall rtThreadNativeMain(void *pvArgs) RT_NOTHROW_PROTO;
    6262static void rtThreadWinTellDebuggerThreadName(uint32_t idThread, const char *pszName);
    6363
    … …  
    243243 * Wrapper which unpacks the param stuff and calls thread function.
    244244 */
    245 static unsigned __stdcall rtThreadNativeMain(void *pvArgs)
     245static unsigned __stdcall rtThreadNativeMain(void *pvArgs) RT_NOTHROW_DEF
    246246{
    247247    DWORD           dwThreadId = GetCurrentThreadId();

  • trunk/src/VBox/Runtime/r3/xml.cpp

    r84000 r85121  
    385385struct GlobalLock::Data
    386386{
    387     PFNEXTERNALENTITYLOADER pOldLoader;
     387    PFNEXTERNALENTITYLOADER pfnOldLoader;
    388388    RTCLock lock;
    389389
    390390    Data()
    391         : pOldLoader(NULL),
    392           lock(gGlobal.sxml.lock)
     391        : pfnOldLoader(NULL)
     392        , lock(gGlobal.sxml.lock)
    393393    {
    394394    }
    … …  
    402402GlobalLock::~GlobalLock()
    403403{
    404     if (m->pOldLoader)
    405         xmlSetExternalEntityLoader(m->pOldLoader);
     404    if (m->pfnOldLoader)
     405        xmlSetExternalEntityLoader(m->pfnOldLoader);
    406406    delete m;
    407407    m = NULL;
    408408}
    409409
    410 void GlobalLock::setExternalEntityLoader(PFNEXTERNALENTITYLOADER pLoader)
    411 {
    412     m->pOldLoader = xmlGetExternalEntityLoader();
    413     xmlSetExternalEntityLoader(pLoader);
     410void GlobalLock::setExternalEntityLoader(PFNEXTERNALENTITYLOADER pfnLoader)
     411{
     412    m->pfnOldLoader = xmlGetExternalEntityLoader();
     413    xmlSetExternalEntityLoader(pfnLoader);
    414414}
    415415
    … …  
    18241824////////////////////////////////////////////////////////////////////////////////
    18251825
    1826 static void xmlParserBaseGenericError(void *pCtx, const char *pszMsg, ...)
     1826static void xmlParserBaseGenericError(void *pCtx, const char *pszMsg, ...) RT_NOTHROW_DEF
    18271827{
    18281828    NOREF(pCtx);
    … …  
    18331833}
    18341834
    1835 static void xmlParserBaseStructuredError(void *pCtx, xmlErrorPtr error)
     1835static void xmlParserBaseStructuredError(void *pCtx, xmlErrorPtr error) RT_NOTHROW_DEF
    18361836{
    18371837    NOREF(pCtx);
    … …  
    20182018}
    20192019
    2020 /*static*/ int XmlStringWriter::WriteCallbackForSize(void *pvUser, const char *pachBuf, int cbToWrite)
     2020/*static*/ int XmlStringWriter::WriteCallbackForSize(void *pvUser, const char *pachBuf, int cbToWrite) RT_NOTHROW_DEF
    20212021{
    20222022    if (cbToWrite > 0)
    … …  
    20262026}
    20272027
    2028 /*static*/ int XmlStringWriter::WriteCallbackForReal(void *pvUser, const char *pachBuf, int cbToWrite)
     2028/*static*/ int XmlStringWriter::WriteCallbackForReal(void *pvUser, const char *pachBuf, int cbToWrite) RT_NOTHROW_DEF
    20292029{
    20302030    XmlStringWriter *pThis = static_cast<XmlStringWriter*>(pvUser);
    … …  
    20482048}
    20492049
    2050 int XmlStringWriter::CloseCallback(void *pvUser)
     2050/*static*/ int XmlStringWriter::CloseCallback(void *pvUser) RT_NOTHROW_DEF
    20512051{
    20522052    /* Nothing to do here. */
    … …  
    21732173}
    21742174
    2175 // static
    2176 int XmlFileParser::ReadCallback(void *aCtxt, char *aBuf, int aLen)
     2175/*static*/ int XmlFileParser::ReadCallback(void *aCtxt, char *aBuf, int aLen) RT_NOTHROW_DEF
    21772176{
    21782177    ReadContext *pContext = static_cast<ReadContext*>(aCtxt);
    … …  
    21932192}
    21942193
    2195 int XmlFileParser::CloseCallback(void *aCtxt)
     2194/*static*/ int XmlFileParser::CloseCallback(void *aCtxt) RT_NOTHROW_DEF
    21962195{
    21972196    /// @todo to be written
    … …  
    23012300}
    23022301
    2303 int XmlFileWriter::WriteCallback(void *aCtxt, const char *aBuf, int aLen)
     2302/*static*/ int XmlFileWriter::WriteCallback(void *aCtxt, const char *aBuf, int aLen) RT_NOTHROW_DEF
    23042303{
    23052304    WriteContext *pContext = static_cast<WriteContext*>(aCtxt);
    … …  
    23192318}
    23202319
    2321 int XmlFileWriter::CloseCallback(void *aCtxt)
     2320/*static*/ int XmlFileWriter::CloseCallback(void *aCtxt) RT_NOTHROW_DEF
    23222321{
    23232322    /// @todo to be written

  • trunk/src/VBox/Runtime/testcase/tstLdr-4.cpp

    r85085 r85121  
    214214                break;
    215215            }
    216             typedef DECLCALLBACKPTR(int, PFNDISASMTEST1)(void);
     216            typedef DECLCALLBACKPTR(int, PFNDISASMTEST1,(void));
    217217            PFNDISASMTEST1 pfnDisasmTest1 = (PFNDISASMTEST1)(uintptr_t)Value;
    218218            RTPrintf("tstLdr-4: pfnDisasmTest1=%p / add-symbol-file %s %#x\n", pfnDisasmTest1, pszFilename, aLoads[i].pvBits);

  • trunk/src/VBox/Runtime/testcase/tstRTBigNum.cpp

    r82968 r85121  
    4242
    4343#if 1
     44# include "../include/internal/openssl-pre.h"
    4445# include <openssl/bn.h>
     46# include "../include/internal/openssl-post.h"
    4547#endif
    4648

  • trunk/src/VBox/Runtime/tools/RTFTPServer.cpp

    r82843 r85121  
    110110*********************************************************************************************************************************/
    111111/** Set by the signal handler when the FTP server shall be terminated. */
    112 static volatile bool  g_fCanceled  = false;
     112static volatile bool  g_fCanceled = false;
    113113static FTPSERVERDATA  g_FTPServerData;
    114114
    115115
    116116#ifdef RT_OS_WINDOWS
    117 static BOOL WINAPI signalHandler(DWORD dwCtrlType)
     117static BOOL WINAPI signalHandler(DWORD dwCtrlType) RT_NOTHROW_DEF
    118118{
    119119    bool fEventHandled = FALSE;
    … …  
    143143 * unnecessary here.
    144144 */
    145 static void signalHandler(int iSignal)
     145static void signalHandler(int iSignal) RT_NOTHROW_DEF
    146146{
    147147    NOREF(iSignal);

  • trunk/src/VBox/Runtime/win/errmsgwin-sorter.cpp

    r84070 r85121  
    121121
    122122/** qsort callback. */
    123 static int CompareWinErrMsg(const void *pv1, const void *pv2)
     123static int CompareWinErrMsg(const void *pv1, const void *pv2) RT_NOTHROW_DEF
    124124{
    125125    PCRTWINERRMSG p1 = (PCRTWINERRMSG)pv1;
Note: See TracChangeset for help on using the changeset viewer.

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