Changeset 85128 in vbox

Timestamp:

Jul 8, 2020 11:58:23 PM (4 years ago)

Author:

vboxsync

Message:

SUPLib: valign. bugref:9794

File:

• trunk/src/VBox/HostDrivers/Support/SUPLibInternal.h (modified) (2 diffs)

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

@@ -385 +385 @@
 
 /** @copydoc RTPathAppPrivateNoArch */
-DECLHIDDEN(int)    supR3HardenedPathAppPrivateNoArch(char *pszPath, size_t cchPath);
+DECLHIDDEN(int)     supR3HardenedPathAppPrivateNoArch(char *pszPath, size_t cchPath);
 /** @copydoc RTPathAppPrivateArch */
-DECLHIDDEN(int)    supR3HardenedPathAppPrivateArch(char *pszPath, size_t cchPath);
+DECLHIDDEN(int)     supR3HardenedPathAppPrivateArch(char *pszPath, size_t cchPath);
 /** @copydoc RTPathSharedLibs */
-DECLHIDDEN(int)    supR3HardenedPathAppSharedLibs(char *pszPath, size_t cchPath);
+DECLHIDDEN(int)     supR3HardenedPathAppSharedLibs(char *pszPath, size_t cchPath);
 /** @copydoc RTPathAppDocs */
-DECLHIDDEN(int)    supR3HardenedPathAppDocs(char *pszPath, size_t cchPath);
+DECLHIDDEN(int)     supR3HardenedPathAppDocs(char *pszPath, size_t cchPath);
 /** @copydoc RTPathExecDir */
-DECLHIDDEN(int)    supR3HardenedPathAppBin(char *pszPath, size_t cchPath);
+DECLHIDDEN(int)     supR3HardenedPathAppBin(char *pszPath, size_t cchPath);
 /** @copydoc RTPathFilename */
-DECLHIDDEN(char *) supR3HardenedPathFilename(const char *pszPath);
+DECLHIDDEN(char *)  supR3HardenedPathFilename(const char *pszPath);
 
 /**
@@ -422 +422 @@
  * Display an error which may or may not be fatal.
  */
-DECLHIDDEN(int)    supR3HardenedErrorV(int rc, bool fFatal, const char *pszFormat, va_list va);
+DECLHIDDEN(int)     supR3HardenedErrorV(int rc, bool fFatal, const char *pszFormat, va_list va);
 
 /**
  * Display an error which may or may not be fatal.
  */
-DECLHIDDEN(int)    supR3HardenedError(int rc, bool fFatal, const char *pszFormat, ...);
+DECLHIDDEN(int)     supR3HardenedError(int rc, bool fFatal, const char *pszFormat, ...);
 
 /**
  * Open any startup log file specified in the argument.
  */
-DECLHIDDEN(void)   supR3HardenedOpenLog(int *pcArgs, char **papszArgs);
+DECLHIDDEN(void)    supR3HardenedOpenLog(int *pcArgs, char **papszArgs);
 
 /**
  * Write to the startup log file.
  */
-DECLHIDDEN(void)   supR3HardenedLogV(const char *pszFormat, va_list va);
+DECLHIDDEN(void)    supR3HardenedLogV(const char *pszFormat, va_list va);
 
 /**
  * Write to the startup log file.
  */
-DECLHIDDEN(void)   supR3HardenedLog(const char *pszFormat, ...);
+DECLHIDDEN(void)    supR3HardenedLog(const char *pszFormat, ...);
 
 /**
  * Flushes the log file.
  */
-DECLHIDDEN(void)   supR3HardenedLogFlush(void);
-
-
-DECLHIDDEN(int)    supR3HardenedVerifyAll(bool fFatal, const char *pszProgName, const char *pszExePath, uint32_t fMainFlags);
-DECLHIDDEN(int)    supR3HardenedVerifyFixedDir(SUPINSTDIR enmDir, bool fFatal, PCSUPINSTFILE pFile);
-DECLHIDDEN(int)    supR3HardenedVerifyFixedFile(const char *pszFilename, bool fFatal);
-DECLHIDDEN(int)    supR3HardenedVerifyDir(const char *pszDirPath, bool fRecursive, bool fCheckFiles, PRTERRINFO pErrInfo);
-DECLHIDDEN(int)    supR3HardenedVerifyFile(const char *pszFilename, RTHCUINTPTR hNativeFile, bool fMaybe3rdParty,
-                                           PRTERRINFO pErrInfo);
+DECLHIDDEN(void)    supR3HardenedLogFlush(void);
+
+
+DECLHIDDEN(int)     supR3HardenedVerifyAll(bool fFatal, const char *pszProgName, const char *pszExePath, uint32_t fMainFlags);
+DECLHIDDEN(int)     supR3HardenedVerifyFixedDir(SUPINSTDIR enmDir, bool fFatal, PCSUPINSTFILE pFile);
+DECLHIDDEN(int)     supR3HardenedVerifyFixedFile(const char *pszFilename, bool fFatal);
+DECLHIDDEN(int)     supR3HardenedVerifyDir(const char *pszDirPath, bool fRecursive, bool fCheckFiles, PRTERRINFO pErrInfo);
+DECLHIDDEN(int)     supR3HardenedVerifyFile(const char *pszFilename, RTHCUINTPTR hNativeFile, bool fMaybe3rdParty,
+                                            PRTERRINFO pErrInfo);
 #if defined(RT_OS_DARWIN) || defined(RT_OS_LINUX)
-DECLHIDDEN(int)    supR3HardenedVerifyFileFollowSymlinks(const char *pszFilename, RTHCUINTPTR hNativeFile,
-                                                                  bool fMaybe3rdParty, PRTERRINFO pErrInfo);
-#endif
-DECLHIDDEN(void)   supR3HardenedGetPreInitData(PSUPPREINITDATA pPreInitData);
-DECLHIDDEN(int)    supR3HardenedRecvPreInitData(PCSUPPREINITDATA pPreInitData);
+DECLHIDDEN(int)     supR3HardenedVerifyFileFollowSymlinks(const char *pszFilename, RTHCUINTPTR hNativeFile,
+                                                          bool fMaybe3rdParty, PRTERRINFO pErrInfo);
+#endif
+DECLHIDDEN(void)    supR3HardenedGetPreInitData(PSUPPREINITDATA pPreInitData);
+DECLHIDDEN(int)     supR3HardenedRecvPreInitData(PCSUPPREINITDATA pPreInitData);
 
 #ifdef RT_OS_WINDOWS
-DECLHIDDEN(void)   supR3HardenedWinInit(uint32_t fFlags, bool fAvastKludge);
-DECLHIDDEN(void)   supR3HardenedWinInitAppBin(uint32_t fFlags);
-DECLHIDDEN(void)   supR3HardenedWinInitVersion(bool fEarlyInit);
-DECLHIDDEN(void)   supR3HardenedWinInitImports(void);
-DECLHIDDEN(void)   supR3HardenedWinModifyDllSearchPath(uint32_t fFlags, const char *pszAppBinPath);
+DECLHIDDEN(void)    supR3HardenedWinInit(uint32_t fFlags, bool fAvastKludge);
+DECLHIDDEN(void)    supR3HardenedWinInitAppBin(uint32_t fFlags);
+DECLHIDDEN(void)    supR3HardenedWinInitVersion(bool fEarlyInit);
+DECLHIDDEN(void)    supR3HardenedWinInitImports(void);
+DECLHIDDEN(void)    supR3HardenedWinModifyDllSearchPath(uint32_t fFlags, const char *pszAppBinPath);
 # ifdef IPRT_INCLUDED_nt_nt_h
-DECLHIDDEN(void)   supR3HardenedWinGetVeryEarlyImports(uintptr_t uNtDllAddr, PFNNTWAITFORSINGLEOBJECT *ppfnNtWaitForSingleObject,
-                                                       PFNNTSETEVENT *ppfnNtSetEvent);
+DECLHIDDEN(void)    supR3HardenedWinGetVeryEarlyImports(uintptr_t uNtDllAddr, PFNNTWAITFORSINGLEOBJECT *ppfnNtWaitForSingleObject,
+                                                        PFNNTSETEVENT *ppfnNtSetEvent);
 # endif
-DECLHIDDEN(void)   supR3HardenedWinInitImportsEarly(uintptr_t uNtDllAddr);
-DECLHIDDEN(void)   supR3HardenedWinInitSyscalls(bool fReportErrors, PRTERRINFO pErrInfo);
-DECLHIDDEN(PFNRT)  supR3HardenedWinGetRealDllSymbol(const char *pszDll, const char *pszProcedure);
-DECLHIDDEN(void)   supR3HardenedWinEnableThreadCreation(void);
-DECLHIDDEN(void)   supR3HardenedWinResolveVerifyTrustApiAndHookThreadCreation(const char *pszProgName);
-DECLHIDDEN(void)   supR3HardenedWinFlushLoaderCache();
-DECLHIDDEN(bool)   supR3HardenedWinIsReSpawnNeeded(int iWhich, int cArgs, char **papszArgs);
-DECLHIDDEN(int)    supR3HardenedWinReSpawn(int iWhich);
+DECLHIDDEN(void)    supR3HardenedWinInitImportsEarly(uintptr_t uNtDllAddr);
+DECLHIDDEN(void)    supR3HardenedWinInitSyscalls(bool fReportErrors, PRTERRINFO pErrInfo);
+DECLHIDDEN(PFNRT)   supR3HardenedWinGetRealDllSymbol(const char *pszDll, const char *pszProcedure);
+DECLHIDDEN(void)    supR3HardenedWinEnableThreadCreation(void);
+DECLHIDDEN(void)    supR3HardenedWinResolveVerifyTrustApiAndHookThreadCreation(const char *pszProgName);
+DECLHIDDEN(void)    supR3HardenedWinFlushLoaderCache();
+DECLHIDDEN(bool)    supR3HardenedWinIsReSpawnNeeded(int iWhich, int cArgs, char **papszArgs);
+DECLHIDDEN(int)     supR3HardenedWinReSpawn(int iWhich);
 # ifdef _WINDEF_
-DECLHIDDEN(void)   supR3HardenedWinCreateParentWatcherThread(HMODULE hVBoxRT);
+DECLHIDDEN(void)    supR3HardenedWinCreateParentWatcherThread(HMODULE hVBoxRT);
 # endif
-DECLHIDDEN(void *) supR3HardenedWinLoadLibrary(const char *pszName, bool fSystem32Only, uint32_t fMainFlags);
+DECLHIDDEN(void *)  supR3HardenedWinLoadLibrary(const char *pszName, bool fSystem32Only, uint32_t fMainFlags);
 extern RTUTF16      g_wszSupLibHardenedExePath[1024];
 # ifdef RTPATH_MAX
 extern char         g_szSupLibHardenedExePath[RTPATH_MAX];
 # endif
-DECLHIDDEN(void)   supR3HardenedWinCompactHeaps(void);
-DECLHIDDEN(void)   supR3HardenedMainOpenDevice(void);
-DECLHIDDEN(char *) supR3HardenedWinReadErrorInfoDevice(char *pszErrorInfo, size_t cbErrorInfo, const char *pszPrefix);
-DECLHIDDEN(void)   supR3HardenedWinReportErrorToParent(const char *pszWhere, SUPINITOP enmWhat, int rc,
-                                                       const char *pszFormat, va_list va);
+DECLHIDDEN(void)    supR3HardenedWinCompactHeaps(void);
+DECLHIDDEN(void)    supR3HardenedMainOpenDevice(void);
+DECLHIDDEN(char *)  supR3HardenedWinReadErrorInfoDevice(char *pszErrorInfo, size_t cbErrorInfo, const char *pszPrefix);
+DECLHIDDEN(void)    supR3HardenedWinReportErrorToParent(const char *pszWhere, SUPINITOP enmWhat, int rc,
+                                                        const char *pszFormat, va_list va);
 #else   /* !RT_OS_WINDOWS */
-DECLHIDDEN(void)   supR3HardenedPosixInit(void);
+DECLHIDDEN(void)    supR3HardenedPosixInit(void);
 #endif  /* !RT_OS_WINDOWS */
 
-SUPR3DECL(int)              supR3PageLock(void *pvStart, size_t cPages, PSUPPAGE paPages);
-SUPR3DECL(int)              supR3PageUnlock(void *pvStart);
+SUPR3DECL(int)      supR3PageLock(void *pvStart, size_t cPages, PSUPPAGE paPages);
+SUPR3DECL(int)      supR3PageUnlock(void *pvStart);
 
 RT_C_DECLS_END