VirtualBox

Changeset 85127 in vbox


Ignore:
Timestamp:
Jul 8, 2020 11:42:18 PM (5 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
139067
Message:

iprt/cdefs.h: Made DECLHIDDEN imply nothrow and restrict its use to function (just like the newly added DECL_HIDDEN_NOTHROW). Added DECL_HIDDEN_ONLY and DECL_HIDDEN_THROW to accompany it. bugref:9794

Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/sup.h

    r85121 r85127  
    11761176 * @param   envp            The environment vector.
    11771177 */
    1178 DECL_HIDDEN_NOTHROW(int) SUPR3HardenedMain(const char *pszProgName, uint32_t fFlags, int argc, char **argv, char **envp);
     1178DECLHIDDEN(int) SUPR3HardenedMain(const char *pszProgName, uint32_t fFlags, int argc, char **argv, char **envp);
    11791179
    11801180/** @name SUPR3HardenedMain flags.

  • trunk/include/iprt/cdefs.h

    r85126 r85127  
    13541354#define DECL_IMPORT_NOTHROW(a_RetType)  DECL_NOTHROW(DECLIMPORT(a_RetType))
    13551355
     1356/** @def DECL_HIDDEN_ONLY
     1357 * How to declare a non-exported function or variable.
     1358 * @param   a_Type  The return type of the function or the data type of the variable.
     1359 * @sa      DECL_HIDDEN, DECL_HIDDEN_DATA, DECL_HIDDEN_CONST
     1360 * @internal Considered more or less internal.
     1361 */
     1362#if !defined(RT_GCC_SUPPORTS_VISIBILITY_HIDDEN) || defined(RT_NO_VISIBILITY_HIDDEN)
     1363# define DECL_HIDDEN_ONLY(a_Type)       a_Type
     1364#else
     1365# define DECL_HIDDEN_ONLY(a_Type)       __attribute__((visibility("hidden"))) a_Type
     1366#endif
     1367
    13561368/** @def DECLHIDDEN
    13571369 * How to declare a non-exported function or variable.
    13581370 * @param   a_Type  The return type of the function or the data type of the variable.
    1359  * @sa      DECL_HIDDEN_DATA, DECL_HIDDEN_CONST
     1371 * @sa      DECL_HIDDEN_THROW, DECL_HIDDEN_DATA, DECL_HIDDEN_CONST
    13601372 * @todo split up into data and non-data.
    13611373 */
    1362 #if !defined(RT_GCC_SUPPORTS_VISIBILITY_HIDDEN) || defined(RT_NO_VISIBILITY_HIDDEN)
    1363 # define DECLHIDDEN(a_Type)             a_Type
    1364 #else
    1365 # define DECLHIDDEN(a_Type)             __attribute__((visibility("hidden"))) a_Type
    1366 #endif
     1374#define DECLHIDDEN(a_Type)              DECL_NOTHROW(DECL_HIDDEN_ONLY(a_Type))
     1375
     1376/** @def DECL_HIDDEN_NOTHROW
     1377 * How to declare a non-exported function that does not throw C++ exceptions.
     1378 * @param   a_RetType   The return type of the function.
     1379 * @note    Same as DECLHIDDEN but provided to go along with DECL_IMPORT_NOTHROW
     1380 *          and DECL_EXPORT_NOTHROW.
     1381 */
     1382#define DECL_HIDDEN_NOTHROW(a_RetType)  DECL_NOTHROW(DECL_HIDDEN_ONLY(a_RetType))
     1383
     1384/** @def DECL_HIDDEN_THROW
     1385 * How to declare a non-exported function that may throw C++ exceptions.
     1386 * @param   a_RetType   The return type of the function.
     1387 */
     1388#define DECL_HIDDEN_THROW(a_RetType)    DECL_HIDDEN_ONLY(a_Type)
    13671389
    13681390/** @def DECL_HIDDEN_DATA
    … …  
    13881410# define DECL_HIDDEN_CONST(a_Type)      DECL_HIDDEN_DATA(a_Type)
    13891411#endif
    1390 
    1391 /** @def DECL_HIDDEN_NOTHROW
    1392  * How to declare a non-exported function that does not throw C++ exceptions.
    1393  * @param   a_RetType   The return type of the function.
    1394  */
    1395 #define DECL_HIDDEN_NOTHROW(a_RetType)  DECL_NOTHROW(DECLHIDDEN(a_RetType))
    13961412
    13971413/** @def DECL_INVALID
    … …  
    14881504 * @note    Use DECLCALLBACKTYPE for typedefs.
    14891505 */
    1490 #define DECLCALLBACK(a_Type)        DECL_NOTHROW(a_Type RT_FAR_CODE RTCALL)
     1506#define DECLCALLBACK(a_RetType)     DECL_NOTHROW(a_RetType RT_FAR_CODE RTCALL)
    14911507
    14921508/** @def DECL_HIDDEN_CALLBACK
    … …  
    14961512 * @note    Use DECLCALLBACKTYPE for typedefs.
    14971513 */
    1498 #define DECL_HIDDEN_CALLBACK(a_Type) DECLHIDDEN(DECL_NOTHROW(a_Type RT_FAR_CODE RTCALL))
     1514#define DECL_HIDDEN_CALLBACK(a_RetType) DECL_HIDDEN_ONLY(DECLCALLBACK(a_RetType))
    14991515
    15001516/** @def DECLCALLBACKTYPE_EX

  • trunk/src/VBox/HostDrivers/Support/SUPLibInternal.h

    r85124 r85127  
    112112#if defined(IN_SUP_HARDENED_R3) && defined(RT_OS_WINDOWS)
    113113# define SUP_HARDENED_NEED_CRT_FUNCTIONS
    114 DECL_HIDDEN_NOTHROW(int)    suplibHardenedMemComp(void const *pvDst, const void *pvSrc, size_t cbToComp);
    115 DECL_HIDDEN_NOTHROW(void *) suplibHardenedMemCopy(void *pvDst, const void *pvSrc, size_t cbToCopy);
    116 DECL_HIDDEN_NOTHROW(void *) suplibHardenedMemSet(void *pvDst, int ch, size_t cbToSet);
    117 DECL_HIDDEN_NOTHROW(char *) suplibHardenedStrCopy(char *pszDst, const char *pszSrc);
    118 DECL_HIDDEN_NOTHROW(size_t) suplibHardenedStrLen(const char *psz);
    119 DECL_HIDDEN_NOTHROW(char *) suplibHardenedStrCat(char *pszDst, const char *pszSrc);
    120 DECL_HIDDEN_NOTHROW(int)    suplibHardenedStrCmp(const char *psz1, const char *psz2);
    121 DECL_HIDDEN_NOTHROW(int)    suplibHardenedStrNCmp(const char *psz1, const char *psz2, size_t cchMax);
     114DECLHIDDEN(int)    suplibHardenedMemComp(void const *pvDst, const void *pvSrc, size_t cbToComp);
     115DECLHIDDEN(void *) suplibHardenedMemCopy(void *pvDst, const void *pvSrc, size_t cbToCopy);
     116DECLHIDDEN(void *) suplibHardenedMemSet(void *pvDst, int ch, size_t cbToSet);
     117DECLHIDDEN(char *) suplibHardenedStrCopy(char *pszDst, const char *pszSrc);
     118DECLHIDDEN(size_t) suplibHardenedStrLen(const char *psz);
     119DECLHIDDEN(char *) suplibHardenedStrCat(char *pszDst, const char *pszSrc);
     120DECLHIDDEN(int)    suplibHardenedStrCmp(const char *psz1, const char *psz2);
     121DECLHIDDEN(int)    suplibHardenedStrNCmp(const char *psz1, const char *psz2, size_t cchMax);
    122122#else
    123123# undef SUP_HARDENED_NEED_CRT_FUNCTIONS
    … …  
    131131# define suplibHardenedStrNCmp strncmp
    132132#endif
    133 DECL_HIDDEN_NOTHROW(DECL_NO_RETURN(void)) suplibHardenedExit(RTEXITCODE rcExit);
    134 DECL_HIDDEN_NOTHROW(void)   suplibHardenedPrintF(const char *pszFormat, ...);
    135 DECL_HIDDEN_NOTHROW(void)   suplibHardenedPrintFV(const char *pszFormat, va_list va);
     133DECLHIDDEN(DECL_NO_RETURN(void)) suplibHardenedExit(RTEXITCODE rcExit);
     134DECLHIDDEN(void)   suplibHardenedPrintF(const char *pszFormat, ...);
     135DECLHIDDEN(void)   suplibHardenedPrintFV(const char *pszFormat, va_list va);
    136136
    137137/** @} */
    … …  
    385385
    386386/** @copydoc RTPathAppPrivateNoArch */
    387 DECL_HIDDEN_NOTHROW(int)    supR3HardenedPathAppPrivateNoArch(char *pszPath, size_t cchPath);
     387DECLHIDDEN(int)    supR3HardenedPathAppPrivateNoArch(char *pszPath, size_t cchPath);
    388388/** @copydoc RTPathAppPrivateArch */
    389 DECL_HIDDEN_NOTHROW(int)    supR3HardenedPathAppPrivateArch(char *pszPath, size_t cchPath);
     389DECLHIDDEN(int)    supR3HardenedPathAppPrivateArch(char *pszPath, size_t cchPath);
    390390/** @copydoc RTPathSharedLibs */
    391 DECL_HIDDEN_NOTHROW(int)    supR3HardenedPathAppSharedLibs(char *pszPath, size_t cchPath);
     391DECLHIDDEN(int)    supR3HardenedPathAppSharedLibs(char *pszPath, size_t cchPath);
    392392/** @copydoc RTPathAppDocs */
    393 DECL_HIDDEN_NOTHROW(int)    supR3HardenedPathAppDocs(char *pszPath, size_t cchPath);
     393DECLHIDDEN(int)    supR3HardenedPathAppDocs(char *pszPath, size_t cchPath);
    394394/** @copydoc RTPathExecDir */
    395 DECL_HIDDEN_NOTHROW(int)    supR3HardenedPathAppBin(char *pszPath, size_t cchPath);
     395DECLHIDDEN(int)    supR3HardenedPathAppBin(char *pszPath, size_t cchPath);
    396396/** @copydoc RTPathFilename */
    397 DECL_HIDDEN_NOTHROW(char *) supR3HardenedPathFilename(const char *pszPath);
     397DECLHIDDEN(char *) supR3HardenedPathFilename(const char *pszPath);
    398398
    399399/**
    400400 * Display a fatal error and try call TrustedError or quit.
    401401 */
    402 DECL_NO_RETURN(DECL_HIDDEN_NOTHROW(void)) supR3HardenedFatalMsgV(const char *pszWhere, SUPINITOP enmWhat, int rc,
     402DECL_NO_RETURN(DECLHIDDEN(void)) supR3HardenedFatalMsgV(const char *pszWhere, SUPINITOP enmWhat, int rc,
    403403                                                                 const char *pszMsgFmt, va_list va);
    404404
    … …  
    406406 * Display a fatal error and try call TrustedError or quit.
    407407 */
    408 DECL_NO_RETURN(DECL_HIDDEN_NOTHROW(void)) supR3HardenedFatalMsg(const char *pszWhere, SUPINITOP enmWhat, int rc,
     408DECL_NO_RETURN(DECLHIDDEN(void)) supR3HardenedFatalMsg(const char *pszWhere, SUPINITOP enmWhat, int rc,
    409409                                                                const char *pszMsgFmt, ...);
    410410
    … …  
    412412 * Display a fatal error and quit.
    413413 */
    414 DECL_NO_RETURN(DECL_HIDDEN_NOTHROW(void)) supR3HardenedFatalV(const char *pszFormat, va_list va);
     414DECL_NO_RETURN(DECLHIDDEN(void)) supR3HardenedFatalV(const char *pszFormat, va_list va);
    415415
    416416/**
    417417 * Display a fatal error and quit.
    418418 */
    419 DECL_NO_RETURN(DECL_HIDDEN_NOTHROW(void)) supR3HardenedFatal(const char *pszFormat, ...);
     419DECL_NO_RETURN(DECLHIDDEN(void)) supR3HardenedFatal(const char *pszFormat, ...);
    420420
    421421/**
    422422 * Display an error which may or may not be fatal.
    423423 */
    424 DECL_HIDDEN_NOTHROW(int)    supR3HardenedErrorV(int rc, bool fFatal, const char *pszFormat, va_list va);
     424DECLHIDDEN(int)    supR3HardenedErrorV(int rc, bool fFatal, const char *pszFormat, va_list va);
    425425
    426426/**
    427427 * Display an error which may or may not be fatal.
    428428 */
    429 DECL_HIDDEN_NOTHROW(int)    supR3HardenedError(int rc, bool fFatal, const char *pszFormat, ...);
     429DECLHIDDEN(int)    supR3HardenedError(int rc, bool fFatal, const char *pszFormat, ...);
    430430
    431431/**
    432432 * Open any startup log file specified in the argument.
    433433 */
    434 DECL_HIDDEN_NOTHROW(void)   supR3HardenedOpenLog(int *pcArgs, char **papszArgs);
     434DECLHIDDEN(void)   supR3HardenedOpenLog(int *pcArgs, char **papszArgs);
    435435
    436436/**
    437437 * Write to the startup log file.
    438438 */
    439 DECL_HIDDEN_NOTHROW(void)   supR3HardenedLogV(const char *pszFormat, va_list va);
     439DECLHIDDEN(void)   supR3HardenedLogV(const char *pszFormat, va_list va);
    440440
    441441/**
    442442 * Write to the startup log file.
    443443 */
    444 DECL_HIDDEN_NOTHROW(void)   supR3HardenedLog(const char *pszFormat, ...);
     444DECLHIDDEN(void)   supR3HardenedLog(const char *pszFormat, ...);
    445445
    446446/**
    447447 * Flushes the log file.
    448448 */
    449 DECL_HIDDEN_NOTHROW(void)   supR3HardenedLogFlush(void);
    450 
    451 
    452 DECL_HIDDEN_NOTHROW(int)    supR3HardenedVerifyAll(bool fFatal, const char *pszProgName, const char *pszExePath, uint32_t fMainFlags);
    453 DECL_HIDDEN_NOTHROW(int)    supR3HardenedVerifyFixedDir(SUPINSTDIR enmDir, bool fFatal, PCSUPINSTFILE pFile);
    454 DECL_HIDDEN_NOTHROW(int)    supR3HardenedVerifyFixedFile(const char *pszFilename, bool fFatal);
    455 DECL_HIDDEN_NOTHROW(int)    supR3HardenedVerifyDir(const char *pszDirPath, bool fRecursive, bool fCheckFiles, PRTERRINFO pErrInfo);
    456 DECL_HIDDEN_NOTHROW(int)    supR3HardenedVerifyFile(const char *pszFilename, RTHCUINTPTR hNativeFile, bool fMaybe3rdParty,
    457                                                     PRTERRINFO pErrInfo);
     449DECLHIDDEN(void)   supR3HardenedLogFlush(void);
     450
     451
     452DECLHIDDEN(int)    supR3HardenedVerifyAll(bool fFatal, const char *pszProgName, const char *pszExePath, uint32_t fMainFlags);
     453DECLHIDDEN(int)    supR3HardenedVerifyFixedDir(SUPINSTDIR enmDir, bool fFatal, PCSUPINSTFILE pFile);
     454DECLHIDDEN(int)    supR3HardenedVerifyFixedFile(const char *pszFilename, bool fFatal);
     455DECLHIDDEN(int)    supR3HardenedVerifyDir(const char *pszDirPath, bool fRecursive, bool fCheckFiles, PRTERRINFO pErrInfo);
     456DECLHIDDEN(int)    supR3HardenedVerifyFile(const char *pszFilename, RTHCUINTPTR hNativeFile, bool fMaybe3rdParty,
     457                                           PRTERRINFO pErrInfo);
    458458#if defined(RT_OS_DARWIN) || defined(RT_OS_LINUX)
    459 DECL_HIDDEN_NOTHROW(int)    supR3HardenedVerifyFileFollowSymlinks(const char *pszFilename, RTHCUINTPTR hNativeFile,
     459DECLHIDDEN(int)    supR3HardenedVerifyFileFollowSymlinks(const char *pszFilename, RTHCUINTPTR hNativeFile,
    460460                                                                  bool fMaybe3rdParty, PRTERRINFO pErrInfo);
    461461#endif
    462 DECL_HIDDEN_NOTHROW(void)   supR3HardenedGetPreInitData(PSUPPREINITDATA pPreInitData);
    463 DECL_HIDDEN_NOTHROW(int)    supR3HardenedRecvPreInitData(PCSUPPREINITDATA pPreInitData);
     462DECLHIDDEN(void)   supR3HardenedGetPreInitData(PSUPPREINITDATA pPreInitData);
     463DECLHIDDEN(int)    supR3HardenedRecvPreInitData(PCSUPPREINITDATA pPreInitData);
    464464
    465465#ifdef RT_OS_WINDOWS
    466 DECL_HIDDEN_NOTHROW(void)   supR3HardenedWinInit(uint32_t fFlags, bool fAvastKludge);
    467 DECL_HIDDEN_NOTHROW(void)   supR3HardenedWinInitAppBin(uint32_t fFlags);
    468 DECL_HIDDEN_NOTHROW(void)   supR3HardenedWinInitVersion(bool fEarlyInit);
    469 DECL_HIDDEN_NOTHROW(void)   supR3HardenedWinInitImports(void);
    470 DECL_HIDDEN_NOTHROW(void)   supR3HardenedWinModifyDllSearchPath(uint32_t fFlags, const char *pszAppBinPath);
     466DECLHIDDEN(void)   supR3HardenedWinInit(uint32_t fFlags, bool fAvastKludge);
     467DECLHIDDEN(void)   supR3HardenedWinInitAppBin(uint32_t fFlags);
     468DECLHIDDEN(void)   supR3HardenedWinInitVersion(bool fEarlyInit);
     469DECLHIDDEN(void)   supR3HardenedWinInitImports(void);
     470DECLHIDDEN(void)   supR3HardenedWinModifyDllSearchPath(uint32_t fFlags, const char *pszAppBinPath);
    471471# ifdef IPRT_INCLUDED_nt_nt_h
    472 DECL_HIDDEN_NOTHROW(void)   supR3HardenedWinGetVeryEarlyImports(uintptr_t uNtDllAddr,
    473                                                                 PFNNTWAITFORSINGLEOBJECT *ppfnNtWaitForSingleObject,
    474                                                                 PFNNTSETEVENT *ppfnNtSetEvent);
     472DECLHIDDEN(void)   supR3HardenedWinGetVeryEarlyImports(uintptr_t uNtDllAddr, PFNNTWAITFORSINGLEOBJECT *ppfnNtWaitForSingleObject,
     473                                                       PFNNTSETEVENT *ppfnNtSetEvent);
    475474# endif
    476 DECL_HIDDEN_NOTHROW(void)   supR3HardenedWinInitImportsEarly(uintptr_t uNtDllAddr);
    477 DECL_HIDDEN_NOTHROW(void)   supR3HardenedWinInitSyscalls(bool fReportErrors, PRTERRINFO pErrInfo);
    478 DECL_HIDDEN_NOTHROW(PFNRT)  supR3HardenedWinGetRealDllSymbol(const char *pszDll, const char *pszProcedure);
    479 DECL_HIDDEN_NOTHROW(void)   supR3HardenedWinEnableThreadCreation(void);
    480 DECL_HIDDEN_NOTHROW(void)   supR3HardenedWinResolveVerifyTrustApiAndHookThreadCreation(const char *pszProgName);
    481 DECL_HIDDEN_NOTHROW(void)   supR3HardenedWinFlushLoaderCache();
    482 DECL_HIDDEN_NOTHROW(bool)   supR3HardenedWinIsReSpawnNeeded(int iWhich, int cArgs, char **papszArgs);
    483 DECL_HIDDEN_NOTHROW(int)    supR3HardenedWinReSpawn(int iWhich);
     475DECLHIDDEN(void)   supR3HardenedWinInitImportsEarly(uintptr_t uNtDllAddr);
     476DECLHIDDEN(void)   supR3HardenedWinInitSyscalls(bool fReportErrors, PRTERRINFO pErrInfo);
     477DECLHIDDEN(PFNRT)  supR3HardenedWinGetRealDllSymbol(const char *pszDll, const char *pszProcedure);
     478DECLHIDDEN(void)   supR3HardenedWinEnableThreadCreation(void);
     479DECLHIDDEN(void)   supR3HardenedWinResolveVerifyTrustApiAndHookThreadCreation(const char *pszProgName);
     480DECLHIDDEN(void)   supR3HardenedWinFlushLoaderCache();
     481DECLHIDDEN(bool)   supR3HardenedWinIsReSpawnNeeded(int iWhich, int cArgs, char **papszArgs);
     482DECLHIDDEN(int)    supR3HardenedWinReSpawn(int iWhich);
    484483# ifdef _WINDEF_
    485 DECL_HIDDEN_NOTHROW(void)   supR3HardenedWinCreateParentWatcherThread(HMODULE hVBoxRT);
     484DECLHIDDEN(void)   supR3HardenedWinCreateParentWatcherThread(HMODULE hVBoxRT);
    486485# endif
    487 DECL_HIDDEN_NOTHROW(void *) supR3HardenedWinLoadLibrary(const char *pszName, bool fSystem32Only, uint32_t fMainFlags);
     486DECLHIDDEN(void *) supR3HardenedWinLoadLibrary(const char *pszName, bool fSystem32Only, uint32_t fMainFlags);
    488487extern RTUTF16      g_wszSupLibHardenedExePath[1024];
    489488# ifdef RTPATH_MAX
    490489extern char         g_szSupLibHardenedExePath[RTPATH_MAX];
    491490# endif
    492 DECL_HIDDEN_NOTHROW(void)   supR3HardenedWinCompactHeaps(void);
    493 DECL_HIDDEN_NOTHROW(void)   supR3HardenedMainOpenDevice(void);
    494 DECL_HIDDEN_NOTHROW(char *) supR3HardenedWinReadErrorInfoDevice(char *pszErrorInfo, size_t cbErrorInfo, const char *pszPrefix);
    495 DECL_HIDDEN_NOTHROW(void)   supR3HardenedWinReportErrorToParent(const char *pszWhere, SUPINITOP enmWhat, int rc,
    496                                                         const char *pszFormat, va_list va);
     491DECLHIDDEN(void)   supR3HardenedWinCompactHeaps(void);
     492DECLHIDDEN(void)   supR3HardenedMainOpenDevice(void);
     493DECLHIDDEN(char *) supR3HardenedWinReadErrorInfoDevice(char *pszErrorInfo, size_t cbErrorInfo, const char *pszPrefix);
     494DECLHIDDEN(void)   supR3HardenedWinReportErrorToParent(const char *pszWhere, SUPINITOP enmWhat, int rc,
     495                                                       const char *pszFormat, va_list va);
    497496#else   /* !RT_OS_WINDOWS */
    498 DECL_HIDDEN_NOTHROW(void)   supR3HardenedPosixInit(void);
     497DECLHIDDEN(void)   supR3HardenedPosixInit(void);
    499498#endif  /* !RT_OS_WINDOWS */
    500499

  • trunk/src/VBox/HostDrivers/Support/SUPR3HardenedIPRT.cpp

    r85093 r85127  
    4545 * @copydoc RTPathFilename
    4646 */
    47 DECL_HIDDEN_NOTHROW(char *) supR3HardenedPathFilename(const char *pszPath)
     47DECLHIDDEN(char *) supR3HardenedPathFilename(const char *pszPath)
    4848{
    4949    return RTPathFilename(pszPath);
    … …  
    5454 * @copydoc RTPathAppPrivateNoArch
    5555 */
    56 DECL_HIDDEN_NOTHROW(int) supR3HardenedPathAppPrivateNoArch(char *pszPath, size_t cchPath)
     56DECLHIDDEN(int) supR3HardenedPathAppPrivateNoArch(char *pszPath, size_t cchPath)
    5757{
    5858    return RTPathAppPrivateNoArch(pszPath, cchPath);
    … …  
    6363 * @copydoc RTPathAppPrivateArch
    6464 */
    65 DECL_HIDDEN_NOTHROW(int) supR3HardenedPathAppPrivateArch(char *pszPath, size_t cchPath)
     65DECLHIDDEN(int) supR3HardenedPathAppPrivateArch(char *pszPath, size_t cchPath)
    6666{
    6767    return RTPathAppPrivateArch(pszPath, cchPath);
    … …  
    7272 * @copydoc RTPathSharedLibs
    7373 */
    74 DECL_HIDDEN_NOTHROW(int) supR3HardenedPathAppSharedLibs(char *pszPath, size_t cchPath)
     74DECLHIDDEN(int) supR3HardenedPathAppSharedLibs(char *pszPath, size_t cchPath)
    7575{
    7676    return RTPathSharedLibs(pszPath, cchPath);
    … …  
    8181 * @copydoc RTPathAppDocs
    8282 */
    83 DECL_HIDDEN_NOTHROW(int) supR3HardenedPathAppDocs(char *pszPath, size_t cchPath)
     83DECLHIDDEN(int) supR3HardenedPathAppDocs(char *pszPath, size_t cchPath)
    8484{
    8585    return RTPathAppDocs(pszPath, cchPath);
    … …  
    9090 * @copydoc RTPathExecDir
    9191 */
    92 DECL_HIDDEN_NOTHROW(int) supR3HardenedPathAppBin(char *pszPath, size_t cchPath)
     92DECLHIDDEN(int) supR3HardenedPathAppBin(char *pszPath, size_t cchPath)
    9393{
    9494    return RTPathExecDir(pszPath, cchPath);
    … …  
    9696
    9797
    98 DECL_NO_RETURN(DECL_HIDDEN_NOTHROW(void)) supR3HardenedFatalMsgV(const char *pszWhere, SUPINITOP enmWhat, int rc,
    99                                                                  const char *pszMsgFmt, va_list va)
     98DECL_NO_RETURN(DECLHIDDEN(void)) supR3HardenedFatalMsgV(const char *pszWhere, SUPINITOP enmWhat, int rc,
     99                                                        const char *pszMsgFmt, va_list va)
    100100{
    101101    va_list vaCopy;
    … …  
    107107
    108108
    109 DECL_NO_RETURN(DECL_HIDDEN_NOTHROW(void)) supR3HardenedFatalMsg(const char *pszWhere, SUPINITOP enmWhat, int rc,
    110                                                                 const char *pszMsgFmt, ...)
     109DECL_NO_RETURN(DECLHIDDEN(void)) supR3HardenedFatalMsg(const char *pszWhere, SUPINITOP enmWhat, int rc,
     110                                                       const char *pszMsgFmt, ...)
    111111{
    112112    va_list va;
    … …  
    117117
    118118
    119 DECL_NO_RETURN(DECL_HIDDEN_NOTHROW(void)) supR3HardenedFatalV(const char *pszFormat, va_list va)
     119DECL_NO_RETURN(DECLHIDDEN(void)) supR3HardenedFatalV(const char *pszFormat, va_list va)
    120120{
    121121    va_list vaCopy;
    … …  
    126126
    127127
    128 DECL_NO_RETURN(DECL_HIDDEN_NOTHROW(void)) supR3HardenedFatal(const char *pszFormat, ...)
     128DECL_NO_RETURN(DECLHIDDEN(void)) supR3HardenedFatal(const char *pszFormat, ...)
    129129{
    130130    va_list va;
    … …  
    135135
    136136
    137 DECL_HIDDEN_NOTHROW(int) supR3HardenedErrorV(int rc, bool fFatal, const char *pszFormat, va_list va)
     137DECLHIDDEN(int) supR3HardenedErrorV(int rc, bool fFatal, const char *pszFormat, va_list va)
    138138{
    139139    if (fFatal)
    … …  
    150150
    151151
    152 DECL_HIDDEN_NOTHROW(int) supR3HardenedError(int rc, bool fFatal, const char *pszFormat, ...)
     152DECLHIDDEN(int) supR3HardenedError(int rc, bool fFatal, const char *pszFormat, ...)
    153153{
    154154    va_list va;

  • trunk/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp

    r85123 r85127  
    671671 * @param   rcExit      The exit code.
    672672 */
    673 DECL_HIDDEN_NOTHROW(DECL_NO_RETURN(void)) suplibHardenedExit(RTEXITCODE rcExit)
     673DECLHIDDEN(DECL_NO_RETURN(void)) suplibHardenedExit(RTEXITCODE rcExit)
    674674{
    675675    for (;;)
    … …  
    888888 * @param   va          Arguments to format.
    889889 */
    890 DECL_HIDDEN_NOTHROW(void) suplibHardenedPrintFV(const char *pszFormat, va_list va)
     890DECLHIDDEN(void) suplibHardenedPrintFV(const char *pszFormat, va_list va)
    891891{
    892892#ifdef IPRT_NO_CRT
    … …  
    11221122 * @param   ...         Arguments to format.
    11231123 */
    1124 DECL_HIDDEN_NOTHROW(void) suplibHardenedPrintF(const char *pszFormat, ...)
     1124DECLHIDDEN(void) suplibHardenedPrintF(const char *pszFormat, ...)
    11251125{
    11261126    va_list va;
    … …  
    11701170 * @copydoc RTPathFilename
    11711171 */
    1172 DECL_HIDDEN_NOTHROW(char *) supR3HardenedPathFilename(const char *pszPath)
     1172DECLHIDDEN(char *) supR3HardenedPathFilename(const char *pszPath)
    11731173{
    11741174    const char *psz = pszPath;
    … …  
    12061206 * @copydoc RTPathAppPrivateNoArch
    12071207 */
    1208 DECL_HIDDEN_NOTHROW(int) supR3HardenedPathAppPrivateNoArch(char *pszPath, size_t cchPath)
     1208DECLHIDDEN(int) supR3HardenedPathAppPrivateNoArch(char *pszPath, size_t cchPath)
    12091209{
    12101210#if !defined(RT_OS_WINDOWS) && defined(RTPATH_APP_PRIVATE)
    … …  
    12251225 * @copydoc RTPathAppPrivateArch
    12261226 */
    1227 DECL_HIDDEN_NOTHROW(int) supR3HardenedPathAppPrivateArch(char *pszPath, size_t cchPath)
     1227DECLHIDDEN(int) supR3HardenedPathAppPrivateArch(char *pszPath, size_t cchPath)
    12281228{
    12291229#if !defined(RT_OS_WINDOWS) && defined(RTPATH_APP_PRIVATE_ARCH)
    … …  
    12441244 * @copydoc RTPathSharedLibs
    12451245 */
    1246 DECL_HIDDEN_NOTHROW(int) supR3HardenedPathAppSharedLibs(char *pszPath, size_t cchPath)
     1246DECLHIDDEN(int) supR3HardenedPathAppSharedLibs(char *pszPath, size_t cchPath)
    12471247{
    12481248#if !defined(RT_OS_WINDOWS) && defined(RTPATH_SHARED_LIBS)
    … …  
    12631263 * @copydoc RTPathAppDocs
    12641264 */
    1265 DECL_HIDDEN_NOTHROW(int) supR3HardenedPathAppDocs(char *pszPath, size_t cchPath)
     1265DECLHIDDEN(int) supR3HardenedPathAppDocs(char *pszPath, size_t cchPath)
    12661266{
    12671267#if !defined(RT_OS_WINDOWS) && defined(RTPATH_APP_DOCS)
    … …  
    14321432 * @remarks not quite like RTPathExecDir actually...
    14331433 */
    1434 DECL_HIDDEN_NOTHROW(int) supR3HardenedPathAppBin(char *pszPath, size_t cchPath)
     1434DECLHIDDEN(int) supR3HardenedPathAppBin(char *pszPath, size_t cchPath)
    14351435{
    14361436    /*
    … …  
    14591459#endif
    14601460
    1461 DECL_HIDDEN_NOTHROW(void) supR3HardenedOpenLog(int *pcArgs, char **papszArgs)
     1461DECLHIDDEN(void) supR3HardenedOpenLog(int *pcArgs, char **papszArgs)
    14621462{
    14631463    static const char s_szLogOption[] = "--sup-hardening-log=";
    … …  
    15271527
    15281528
    1529 DECL_HIDDEN_NOTHROW(void) supR3HardenedLogV(const char *pszFormat, va_list va)
     1529DECLHIDDEN(void) supR3HardenedLogV(const char *pszFormat, va_list va)
    15301530{
    15311531#ifdef RT_OS_WINDOWS
    … …  
    15591559
    15601560
    1561 DECL_HIDDEN_NOTHROW(void) supR3HardenedLog(const char *pszFormat,  ...)
     1561DECLHIDDEN(void) supR3HardenedLog(const char *pszFormat,  ...)
    15621562{
    15631563    va_list va;
    … …  
    15681568
    15691569
    1570 DECL_HIDDEN_NOTHROW(void) supR3HardenedLogFlush(void)
     1570DECLHIDDEN(void) supR3HardenedLogFlush(void)
    15711571{
    15721572#ifdef RT_OS_WINDOWS
    … …  
    16471647
    16481648
    1649 DECL_NO_RETURN(DECL_HIDDEN_NOTHROW(void)) supR3HardenedFatalMsgV(const char *pszWhere, SUPINITOP enmWhat, int rc,
    1650                                                                  const char *pszMsgFmt, va_list va)
     1649DECL_NO_RETURN(DECLHIDDEN(void)) supR3HardenedFatalMsgV(const char *pszWhere, SUPINITOP enmWhat, int rc,
     1650                                                        const char *pszMsgFmt, va_list va)
    16511651{
    16521652    /*
    … …  
    17641764
    17651765
    1766 DECL_NO_RETURN(DECL_HIDDEN_NOTHROW(void)) supR3HardenedFatalMsg(const char *pszWhere, SUPINITOP enmWhat, int rc,
    1767                                                                 const char *pszMsgFmt, ...)
     1766DECL_NO_RETURN(DECLHIDDEN(void)) supR3HardenedFatalMsg(const char *pszWhere, SUPINITOP enmWhat, int rc,
     1767                                                       const char *pszMsgFmt, ...)
    17681768{
    17691769    va_list va;
    … …  
    17741774
    17751775
    1776 DECL_NO_RETURN(DECL_HIDDEN_NOTHROW(void)) supR3HardenedFatalV(const char *pszFormat, va_list va)
     1776DECL_NO_RETURN(DECLHIDDEN(void)) supR3HardenedFatalV(const char *pszFormat, va_list va)
    17771777{
    17781778    supR3HardenedLog("Fatal error:\n");
    … …  
    18091809
    18101810
    1811 DECL_NO_RETURN(DECL_HIDDEN_NOTHROW(void)) supR3HardenedFatal(const char *pszFormat, ...)
     1811DECL_NO_RETURN(DECLHIDDEN(void)) supR3HardenedFatal(const char *pszFormat, ...)
    18121812{
    18131813    va_list va;
    … …  
    18181818
    18191819
    1820 DECL_HIDDEN_NOTHROW(int) supR3HardenedErrorV(int rc, bool fFatal, const char *pszFormat, va_list va)
     1820DECLHIDDEN(int) supR3HardenedErrorV(int rc, bool fFatal, const char *pszFormat, va_list va)
    18211821{
    18221822    if (fFatal)
    … …  
    18451845
    18461846
    1847 DECL_HIDDEN_NOTHROW(int) supR3HardenedError(int rc, bool fFatal, const char *pszFormat, ...)
     1847DECLHIDDEN(int) supR3HardenedError(int rc, bool fFatal, const char *pszFormat, ...)
    18481848{
    18491849    va_list va;
    … …  
    18611861 * @remarks This function will not return on failure.
    18621862 */
    1863 DECL_HIDDEN_NOTHROW(void) supR3HardenedMainOpenDevice(void)
     1863DECLHIDDEN(void) supR3HardenedMainOpenDevice(void)
    18641864{
    18651865    RTERRINFOSTATIC ErrInfo;
    … …  
    25162516 * @param   envp            The environment vector.
    25172517 */
    2518 DECL_HIDDEN_NOTHROW(int) SUPR3HardenedMain(const char *pszProgName, uint32_t fFlags, int argc, char **argv, char **envp)
     2518DECLHIDDEN(int) SUPR3HardenedMain(const char *pszProgName, uint32_t fFlags, int argc, char **argv, char **envp)
    25192519{
    25202520    SUP_DPRINTF(("SUPR3HardenedMain: pszProgName=%s fFlags=%#x\n", pszProgName, fFlags));

  • trunk/src/VBox/HostDrivers/Support/SUPR3HardenedNoCrt.cpp

    r85119 r85127  
    4141
    4242/** memcmp */
    43 DECL_HIDDEN_NOTHROW(int) suplibHardenedMemComp(void const *pvDst, const void *pvSrc, size_t cbToComp)
     43DECLHIDDEN(int) suplibHardenedMemComp(void const *pvDst, const void *pvSrc, size_t cbToComp)
    4444{
    4545    size_t const   *puDst = (size_t const *)pvDst;
    … …  
    7575
    7676/** memcpy */
    77 DECL_HIDDEN_NOTHROW(void *) suplibHardenedMemCopy(void *pvDst, const void *pvSrc, size_t cbToCopy)
     77DECLHIDDEN(void *) suplibHardenedMemCopy(void *pvDst, const void *pvSrc, size_t cbToCopy)
    7878{
    7979    size_t         *puDst = (size_t *)pvDst;
    … …  
    9898
    9999/** memset */
    100 DECL_HIDDEN_NOTHROW(void *) suplibHardenedMemSet(void *pvDst, int ch, size_t cbToSet)
     100DECLHIDDEN(void *) suplibHardenedMemSet(void *pvDst, int ch, size_t cbToSet)
    101101{
    102102    uint8_t *pbDst = (uint8_t *)pvDst;
    … …  
    112112
    113113/** strcpy */
    114 DECL_HIDDEN_NOTHROW(char *) suplibHardenedStrCopy(char *pszDst, const char *pszSrc)
     114DECLHIDDEN(char *) suplibHardenedStrCopy(char *pszDst, const char *pszSrc)
    115115{
    116116    char *pszRet = pszDst;
    … …  
    126126
    127127/** strlen */
    128 DECL_HIDDEN_NOTHROW(size_t) suplibHardenedStrLen(const char *psz)
     128DECLHIDDEN(size_t) suplibHardenedStrLen(const char *psz)
    129129{
    130130    const char *pszStart = psz;
    … …  
    136136
    137137/** strcat */
    138 DECL_HIDDEN_NOTHROW(char *) suplibHardenedStrCat(char *pszDst, const char *pszSrc)
     138DECLHIDDEN(char *) suplibHardenedStrCat(char *pszDst, const char *pszSrc)
    139139{
    140140    char *pszRet = pszDst;
    … …  
    147147
    148148/** strcmp */
    149 DECL_HIDDEN_NOTHROW(int) suplibHardenedStrCmp(const char *psz1, const char *psz2)
     149DECLHIDDEN(int) suplibHardenedStrCmp(const char *psz1, const char *psz2)
    150150{
    151151    for (;;)
    … …  
    162162
    163163/** strncmp */
    164 DECL_HIDDEN_NOTHROW(int) suplibHardenedStrNCmp(const char *psz1, const char *psz2, size_t cchMax)
     164DECLHIDDEN(int) suplibHardenedStrNCmp(const char *psz1, const char *psz2, size_t cchMax)
    165165{
    166166    while (cchMax-- > 0)

  • trunk/src/VBox/HostDrivers/Support/win/SUPHardenedVerify-win.h

    r85121 r85127  
    4444#ifndef SUP_CERTIFICATES_ONLY
    4545# ifdef RT_OS_WINDOWS
    46 DECL_HIDDEN_NOTHROW(int)     supHardenedWinInitImageVerifier(PRTERRINFO pErrInfo);
    47 DECL_HIDDEN_NOTHROW(void)    supHardenedWinTermImageVerifier(void);
    48 DECL_HIDDEN_NOTHROW(void)    supR3HardenedWinVerifyCacheScheduleImports(RTLDRMOD hLdrMod, PCRTUTF16 pwszName);
    49 DECL_HIDDEN_NOTHROW(void)    supR3HardenedWinVerifyCachePreload(PCRTUTF16 pwszName);
     46DECLHIDDEN(int)     supHardenedWinInitImageVerifier(PRTERRINFO pErrInfo);
     47DECLHIDDEN(void)    supHardenedWinTermImageVerifier(void);
     48DECLHIDDEN(void)    supR3HardenedWinVerifyCacheScheduleImports(RTLDRMOD hLdrMod, PCRTUTF16 pwszName);
     49DECLHIDDEN(void)    supR3HardenedWinVerifyCachePreload(PCRTUTF16 pwszName);
    5050
    5151
    … …  
    7676#define SUPHARDNTVP_F_EXEC_ALLOC_REPLACE_WITH_RW        RT_BIT_32(0)
    7777/** @} */
    78 DECL_HIDDEN_NOTHROW(int)     supHardenedWinVerifyProcess(HANDLE hProcess, HANDLE hThread, SUPHARDNTVPKIND enmKind,
    79                                                          uint32_t fFlags, uint32_t *pcFixes, PRTERRINFO pErrInfo);
    80 DECL_HIDDEN_NOTHROW(int)     supHardNtVpThread(HANDLE hProcess, HANDLE hThread, PRTERRINFO pErrInfo);
    81 DECL_HIDDEN_NOTHROW(int)     supHardNtVpDebugger(HANDLE hProcess, PRTERRINFO pErrInfo);
    82 
    83 DECL_HIDDEN_NOTHROW(bool)    supHardViUtf16PathIsEqualEx(PCRTUTF16 pawcLeft, size_t cwcLeft, const char *pszRight);
    84 DECL_HIDDEN_NOTHROW(bool)    supHardViUniStrPathStartsWithUniStr(UNICODE_STRING const *pUniStrLeft,
    85                                                                  UNICODE_STRING const *pUniStrRight, bool fCheckSlash);
    86 DECL_HIDDEN_NOTHROW(bool)    supHardViUtf16PathStartsWithEx(PCRTUTF16 pwszLeft, uint32_t cwcLeft,
    87                                                             PCRTUTF16 pwszRight, uint32_t cwcRight, bool fCheckSlash);
    88 DECL_HIDDEN_NOTHROW(bool)    supHardViIsAppPatchDir(PCRTUTF16 pwszPath, uint32_t cwcName);
     78DECLHIDDEN(int)     supHardenedWinVerifyProcess(HANDLE hProcess, HANDLE hThread, SUPHARDNTVPKIND enmKind,
     79                                                uint32_t fFlags, uint32_t *pcFixes, PRTERRINFO pErrInfo);
     80DECLHIDDEN(int)     supHardNtVpThread(HANDLE hProcess, HANDLE hThread, PRTERRINFO pErrInfo);
     81DECLHIDDEN(int)     supHardNtVpDebugger(HANDLE hProcess, PRTERRINFO pErrInfo);
     82
     83DECLHIDDEN(bool)    supHardViUtf16PathIsEqualEx(PCRTUTF16 pawcLeft, size_t cwcLeft, const char *pszRight);
     84DECLHIDDEN(bool)    supHardViUniStrPathStartsWithUniStr(UNICODE_STRING const *pUniStrLeft,
     85                                                        UNICODE_STRING const *pUniStrRight, bool fCheckSlash);
     86DECLHIDDEN(bool)    supHardViUtf16PathStartsWithEx(PCRTUTF16 pwszLeft, uint32_t cwcLeft,
     87                                                   PCRTUTF16 pwszRight, uint32_t cwcRight, bool fCheckSlash);
     88DECLHIDDEN(bool)    supHardViIsAppPatchDir(PCRTUTF16 pwszPath, uint32_t cwcName);
    8989
    9090
    … …  
    114114/** Pointer to an SUP image verifier loader reader instance. */
    115115typedef SUPHNTVIRDR *PSUPHNTVIRDR;
    116 DECL_HIDDEN_NOTHROW(int)  supHardNtViRdrCreate(HANDLE hFile, PCRTUTF16 pwszName, uint32_t fFlags, PSUPHNTVIRDR *ppNtViRdr);
    117 DECL_HIDDEN_NOTHROW(bool) supHardenedWinIsWinVerifyTrustCallable(void);
    118 DECL_HIDDEN_NOTHROW(int)  supHardenedWinVerifyImageTrust(HANDLE hFile, PCRTUTF16 pwszName, uint32_t fFlags, int rc,
    119                                                          bool *pfWinVerifyTrust, PRTERRINFO pErrInfo);
    120 DECL_HIDDEN_NOTHROW(int)  supHardenedWinVerifyImageByHandle(HANDLE hFile, PCRTUTF16 pwszName, uint32_t fFlags,
    121                                                             bool fAvoidWinVerifyTrust, bool *pfWinVerifyTrust, PRTERRINFO pErrInfo);
    122 DECL_HIDDEN_NOTHROW(int)  supHardenedWinVerifyImageByHandleNoName(HANDLE hFile, uint32_t fFlags, PRTERRINFO pErrInfo);
    123 DECL_HIDDEN_NOTHROW(int)  supHardenedWinVerifyImageByLdrMod(RTLDRMOD hLdrMod, PCRTUTF16 pwszName, PSUPHNTVIRDR pNtViRdr,
    124                                                             bool fAvoidWinVerifyTrust, bool *pfWinVerifyTrust, PRTERRINFO pErrInfo);
     116DECLHIDDEN(int)  supHardNtViRdrCreate(HANDLE hFile, PCRTUTF16 pwszName, uint32_t fFlags, PSUPHNTVIRDR *ppNtViRdr);
     117DECLHIDDEN(bool) supHardenedWinIsWinVerifyTrustCallable(void);
     118DECLHIDDEN(int)  supHardenedWinVerifyImageTrust(HANDLE hFile, PCRTUTF16 pwszName, uint32_t fFlags, int rc,
     119                                                bool *pfWinVerifyTrust, PRTERRINFO pErrInfo);
     120DECLHIDDEN(int)  supHardenedWinVerifyImageByHandle(HANDLE hFile, PCRTUTF16 pwszName, uint32_t fFlags,
     121                                                   bool fAvoidWinVerifyTrust, bool *pfWinVerifyTrust, PRTERRINFO pErrInfo);
     122DECLHIDDEN(int)  supHardenedWinVerifyImageByHandleNoName(HANDLE hFile, uint32_t fFlags, PRTERRINFO pErrInfo);
     123DECLHIDDEN(int)  supHardenedWinVerifyImageByLdrMod(RTLDRMOD hLdrMod, PCRTUTF16 pwszName, PSUPHNTVIRDR pNtViRdr,
     124                                                   bool fAvoidWinVerifyTrust, bool *pfWinVerifyTrust, PRTERRINFO pErrInfo);
    125125/** @name SUPHNTVI_F_XXX - Flags for supHardenedWinVerifyImageByHandle.
    126126 * @{ */
    … …  
    176176/** Pointer to a loader cache entry. */
    177177typedef SUPHNTLDRCACHEENTRY *PSUPHNTLDRCACHEENTRY;
    178 DECL_HIDDEN_NOTHROW(int)  supHardNtLdrCacheOpen(const char *pszName, PSUPHNTLDRCACHEENTRY *ppEntry, PRTERRINFO pErrInfo);
    179 DECL_HIDDEN_NOTHROW(int)  supHardNtLdrCacheEntryVerify(PSUPHNTLDRCACHEENTRY pEntry, PCRTUTF16 pwszName, PRTERRINFO pErrInfo);
    180 DECL_HIDDEN_NOTHROW(int)  supHardNtLdrCacheEntryGetBits(PSUPHNTLDRCACHEENTRY pEntry, uint8_t **ppbBits, RTLDRADDR uBaseAddress,
    181                                                         PFNRTLDRIMPORT pfnGetImport, void *pvUser, PRTERRINFO pErrInfo);
     178DECLHIDDEN(int)  supHardNtLdrCacheOpen(const char *pszName, PSUPHNTLDRCACHEENTRY *ppEntry, PRTERRINFO pErrInfo);
     179DECLHIDDEN(int)  supHardNtLdrCacheEntryVerify(PSUPHNTLDRCACHEENTRY pEntry, PCRTUTF16 pwszName, PRTERRINFO pErrInfo);
     180DECLHIDDEN(int)  supHardNtLdrCacheEntryGetBits(PSUPHNTLDRCACHEENTRY pEntry, uint8_t **ppbBits, RTLDRADDR uBaseAddress,
     181                                               PFNRTLDRIMPORT pfnGetImport, void *pvUser, PRTERRINFO pErrInfo);
    182182
    183183
    … …  
    189189} SUPHARDNTSYSROOTDIR;
    190190
    191 DECL_HIDDEN_NOTHROW(int) supHardNtGetSystemRootDir(void *pvBuf, uint32_t cbBuf, SUPHARDNTSYSROOTDIR enmDir, PRTERRINFO pErrInfo);
     191DECLHIDDEN(int) supHardNtGetSystemRootDir(void *pvBuf, uint32_t cbBuf, SUPHARDNTSYSROOTDIR enmDir, PRTERRINFO pErrInfo);
    192192
    193193#  ifndef SUPHNTVI_NO_NT_STUFF

  • trunk/src/VBox/HostDrivers/Support/win/SUPHardenedVerifyImage-win.cpp

    r85121 r85127  
    370370 * @param   ppNtViRdr       Where to store the reader instance on success.
    371371 */
    372 DECL_HIDDEN_NOTHROW(int) supHardNtViRdrCreate(HANDLE hFile, PCRTUTF16 pwszName, uint32_t fFlags, PSUPHNTVIRDR *ppNtViRdr)
     372DECLHIDDEN(int) supHardNtViRdrCreate(HANDLE hFile, PCRTUTF16 pwszName, uint32_t fFlags, PSUPHNTVIRDR *ppNtViRdr)
    373373{
    374374    /*
    … …  
    533533 * @param   pszRight            The ascii string.
    534534 */
    535 DECL_HIDDEN_NOTHROW(bool) supHardViUtf16PathIsEqualEx(PCRTUTF16 pawcLeft, size_t cwcLeft, const char *pszRight)
     535DECLHIDDEN(bool) supHardViUtf16PathIsEqualEx(PCRTUTF16 pawcLeft, size_t cwcLeft, const char *pszRight)
    536536{
    537537    for (;;)
    … …  
    648648 * @param   fCheckSlash         Check for a slash following the prefix.
    649649 */
    650 DECL_HIDDEN_NOTHROW(bool) supHardViUtf16PathStartsWithEx(PCRTUTF16 pwszLeft, uint32_t cwcLeft,
    651                                                          PCRTUTF16 pwszRight, uint32_t cwcRight, bool fCheckSlash) RT_NOTHROW_DEF
     650DECLHIDDEN(bool) supHardViUtf16PathStartsWithEx(PCRTUTF16 pwszLeft, uint32_t cwcLeft,
     651                                                PCRTUTF16 pwszRight, uint32_t cwcRight, bool fCheckSlash)
    652652{
    653653    if (cwcLeft < cwcRight || !cwcRight || !pwszRight)
    … …  
    692692 * @param   fCheckSlash         Check for a slash following the prefix.
    693693 */
    694 DECL_HIDDEN_NOTHROW(bool) supHardViUniStrPathStartsWithUniStr(UNICODE_STRING const *pUniStrLeft,
    695                                                               UNICODE_STRING const *pUniStrRight, bool fCheckSlash) RT_NOTHROW_DEF
     694DECLHIDDEN(bool) supHardViUniStrPathStartsWithUniStr(UNICODE_STRING const *pUniStrLeft,
     695                                                     UNICODE_STRING const *pUniStrRight, bool fCheckSlash)
    696696{
    697697    return supHardViUtf16PathStartsWithEx(pUniStrLeft->Buffer, pUniStrLeft->Length / sizeof(WCHAR),
    … …  
    726726 * @param   pwszPath        The path to examine.
    727727 */
    728 DECL_HIDDEN_NOTHROW(bool) supHardViIsAppPatchDir(PCRTUTF16 pwszPath, uint32_t cwcName)
     728DECLHIDDEN(bool) supHardViIsAppPatchDir(PCRTUTF16 pwszPath, uint32_t cwcName)
    729729{
    730730    uint32_t cwcWinDir = (g_System32NtPath.UniStr.Length - sizeof(L"System32")) / sizeof(WCHAR);
    … …  
    11661166 * @param   pErrInfo            Pointer to error info structure. Optional.
    11671167 */
    1168 DECL_HIDDEN_NOTHROW(int) supHardenedWinVerifyImageByLdrMod(RTLDRMOD hLdrMod, PCRTUTF16 pwszName, PSUPHNTVIRDR pNtViRdr,
    1169                                                            bool fAvoidWinVerifyTrust, bool *pfWinVerifyTrust, PRTERRINFO pErrInfo)
     1168DECLHIDDEN(int) supHardenedWinVerifyImageByLdrMod(RTLDRMOD hLdrMod, PCRTUTF16 pwszName, PSUPHNTVIRDR pNtViRdr,
     1169                                                  bool fAvoidWinVerifyTrust, bool *pfWinVerifyTrust, PRTERRINFO pErrInfo)
    11701170{
    11711171    if (pfWinVerifyTrust)
    … …  
    13651365 * @param   pErrInfo            Pointer to error info structure. Optional.
    13661366 */
    1367 DECL_HIDDEN_NOTHROW(int) supHardenedWinVerifyImageByHandle(HANDLE hFile, PCRTUTF16 pwszName, uint32_t fFlags,
    1368                                                            bool fAvoidWinVerifyTrust, bool *pfWinVerifyTrust, PRTERRINFO pErrInfo)
     1367DECLHIDDEN(int) supHardenedWinVerifyImageByHandle(HANDLE hFile, PCRTUTF16 pwszName, uint32_t fFlags,
     1368                                                  bool fAvoidWinVerifyTrust, bool *pfWinVerifyTrust, PRTERRINFO pErrInfo)
    13691369{
    13701370    /*
    … …  
    14121412 * @param   pErrInfo    Pointer to error info structure. Optional.
    14131413 */
    1414 DECL_HIDDEN_NOTHROW(int) supHardenedWinVerifyImageByHandleNoName(HANDLE hFile, uint32_t fFlags, PRTERRINFO pErrInfo)
     1414DECLHIDDEN(int) supHardenedWinVerifyImageByHandleNoName(HANDLE hFile, uint32_t fFlags, PRTERRINFO pErrInfo)
    14151415{
    14161416    /*
    … …  
    14551455 * @param   pErrInfo            Pointer to error info structure. Optional.
    14561456 */
    1457 DECL_HIDDEN_NOTHROW(int) supHardNtGetSystemRootDir(void *pvBuf, uint32_t cbBuf, SUPHARDNTSYSROOTDIR enmDir, PRTERRINFO pErrInfo)
     1457DECLHIDDEN(int) supHardNtGetSystemRootDir(void *pvBuf, uint32_t cbBuf, SUPHARDNTSYSROOTDIR enmDir, PRTERRINFO pErrInfo)
    14581458{
    14591459    HANDLE              hFile = RTNT_INVALID_HANDLE_VALUE;
    … …  
    18001800 * @param   pErrInfo            Where to return extended error info. Optional.
    18011801 */
    1802 DECL_HIDDEN_NOTHROW(int) supHardenedWinInitImageVerifier(PRTERRINFO pErrInfo)
     1802DECLHIDDEN(int) supHardenedWinInitImageVerifier(PRTERRINFO pErrInfo)
    18031803{
    18041804    AssertReturn(!RTCrX509Certificate_IsPresent(&g_BuildX509Cert), VERR_WRONG_ORDER);
    … …  
    18911891 * Releases resources allocated by supHardenedWinInitImageVerifier.
    18921892 */
    1893 DECL_HIDDEN_NOTHROW(void) supHardenedWinTermImageVerifier(void)
     1893DECLHIDDEN(void) supHardenedWinTermImageVerifier(void)
    18941894{
    18951895    if (RTCrX509Certificate_IsPresent(&g_BuildX509Cert))
    … …  
    20562056 * @param   fMandatory          Whether the library is mandatory.
    20572057 */
    2058 DECL_HIDDEN_NOTHROW(HMODULE) supR3HardenedWinLoadSystem32Dll(const char *pszName, bool fMandatory)
     2058DECLHIDDEN(HMODULE) supR3HardenedWinLoadSystem32Dll(const char *pszName, bool fMandatory)
    20592059{
    20602060    WCHAR wszName[200+60];
    … …  
    21702170 * @param   pszProgName     The program name.
    21712171 */
    2172 DECL_HIDDEN_NOTHROW(void) supR3HardenedWinResolveVerifyTrustApiAndHookThreadCreation(const char *pszProgName)
     2172DECLHIDDEN(void) supR3HardenedWinResolveVerifyTrustApiAndHookThreadCreation(const char *pszProgName)
    21732173{
    21742174# ifdef IN_SUP_HARDENED_R3
    … …  
    27762776 * @param   pErrInfo            Pointer to error info structure. Optional.
    27772777 */
    2778 DECL_HIDDEN_NOTHROW(int) supHardenedWinVerifyImageTrust(HANDLE hFile, PCRTUTF16 pwszName, uint32_t fFlags, int rc,
    2779                                                         bool *pfWinVerifyTrust, PRTERRINFO pErrInfo)
     2778DECLHIDDEN(int) supHardenedWinVerifyImageTrust(HANDLE hFile, PCRTUTF16 pwszName, uint32_t fFlags, int rc,
     2779                                               bool *pfWinVerifyTrust, PRTERRINFO pErrInfo)
    27802780{
    27812781    if (pfWinVerifyTrust)
    … …  
    28872887 * @returns true if callable on current thread, false if not.
    28882888 */
    2889 DECL_HIDDEN_NOTHROW(bool) supHardenedWinIsWinVerifyTrustCallable(void)
     2889DECLHIDDEN(bool) supHardenedWinIsWinVerifyTrustCallable(void)
    28902890{
    28912891    return g_pfnWinVerifyTrust != NULL
    … …  
    29012901 * Called from suplibHardenedWindowsMain and suplibOsInit.
    29022902 */
    2903 DECL_HIDDEN_NOTHROW(void) supR3HardenedWinInitVersion(bool fEarly)
     2903DECLHIDDEN(void) supR3HardenedWinInitVersion(bool fEarly)
    29042904{
    29052905    /*

  • trunk/src/VBox/HostDrivers/Support/win/SUPR3HardenedNoCrt-win.cpp

    r85094 r85127  
    239239 * Compacts the heaps before enter wait for parent/child.
    240240 */
    241 DECL_HIDDEN_NOTHROW(void) supR3HardenedWinCompactHeaps(void)
     241DECLHIDDEN(void) supR3HardenedWinCompactHeaps(void)
    242242{
    243243    if (g_hSupR3HardenedHeap)

  • trunk/src/VBox/Runtime/gc/initterm-gc.cpp

    r82968 r85127  
    4646 * Program start nanosecond TS.
    4747 */
    48 uint64_t    g_u64ProgramStartNanoTS;
     48DECL_HIDDEN_DATA(uint64_t) g_u64ProgramStartNanoTS;
    4949
    5050

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

    r82968 r85127  
    3737#if defined(IN_RING3) || defined(IN_RC)
    3838
    39 extern DECLHIDDEN(uint64_t) g_u64ProgramStartNanoTS;
     39extern DECL_HIDDEN_DATA(uint64_t) g_u64ProgramStartNanoTS;
    4040
    4141#endif
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