Changeset 85093 in vbox for trunk/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp

Timestamp:

Jul 7, 2020 6:23:08 PM (5 years ago)

Author:

vboxsync

Message:

SUPLib: Adjustments to avoid CxxFrameHandler4. bugref:9794

File:

• trunk/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp (modified) (24 diffs)

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

@@ -671 +671 @@
  * @param   rcExit      The exit code.
  */
-DECLNORETURN(void) suplibHardenedExit(RTEXITCODE rcExit)
+DECLNORETURN(void) suplibHardenedExit(RTEXITCODE rcExit) RT_NO_THROW_DEF
 {
     for (;;)
@@ -888 +888 @@
  * @param   va          Arguments to format.
  */
-DECLHIDDEN(void) suplibHardenedPrintFV(const char *pszFormat, va_list va)
+DECL_HIDDEN_NOTHROW(void) suplibHardenedPrintFV(const char *pszFormat, va_list va) RT_NO_THROW_DEF
 {
 #ifdef IPRT_NO_CRT
@@ -1122 +1122 @@
  * @param   ...         Arguments to format.
  */
-DECLHIDDEN(void) suplibHardenedPrintF(const char *pszFormat, ...)
+DECL_HIDDEN_NOTHROW(void) suplibHardenedPrintF(const char *pszFormat, ...) RT_NO_THROW_DEF
 {
     va_list va;
@@ -1170 +1170 @@
  * @copydoc RTPathFilename
  */
-DECLHIDDEN(char *) supR3HardenedPathFilename(const char *pszPath)
+DECL_HIDDEN_NOTHROW(char *) supR3HardenedPathFilename(const char *pszPath)
 {
     const char *psz = pszPath;
@@ -1206 +1206 @@
  * @copydoc RTPathAppPrivateNoArch
  */
-DECLHIDDEN(int) supR3HardenedPathAppPrivateNoArch(char *pszPath, size_t cchPath)
+DECL_HIDDEN_NOTHROW(int) supR3HardenedPathAppPrivateNoArch(char *pszPath, size_t cchPath)
 {
 #if !defined(RT_OS_WINDOWS) && defined(RTPATH_APP_PRIVATE)
@@ -1225 +1225 @@
  * @copydoc RTPathAppPrivateArch
  */
-DECLHIDDEN(int) supR3HardenedPathAppPrivateArch(char *pszPath, size_t cchPath)
+DECL_HIDDEN_NOTHROW(int) supR3HardenedPathAppPrivateArch(char *pszPath, size_t cchPath)
 {
 #if !defined(RT_OS_WINDOWS) && defined(RTPATH_APP_PRIVATE_ARCH)
@@ -1244 +1244 @@
  * @copydoc RTPathSharedLibs
  */
-DECLHIDDEN(int) supR3HardenedPathAppSharedLibs(char *pszPath, size_t cchPath)
+DECL_HIDDEN_NOTHROW(int) supR3HardenedPathAppSharedLibs(char *pszPath, size_t cchPath)
 {
 #if !defined(RT_OS_WINDOWS) && defined(RTPATH_SHARED_LIBS)
@@ -1263 +1263 @@
  * @copydoc RTPathAppDocs
  */
-DECLHIDDEN(int) supR3HardenedPathAppDocs(char *pszPath, size_t cchPath)
+DECL_HIDDEN_NOTHROW(int) supR3HardenedPathAppDocs(char *pszPath, size_t cchPath)
 {
 #if !defined(RT_OS_WINDOWS) && defined(RTPATH_APP_DOCS)
@@ -1432 +1432 @@
  * @remarks not quite like RTPathExecDir actually...
  */
-DECLHIDDEN(int) supR3HardenedPathAppBin(char *pszPath, size_t cchPath)
+DECL_HIDDEN_NOTHROW(int) supR3HardenedPathAppBin(char *pszPath, size_t cchPath)
 {
     /*
@@ -1459 +1459 @@
 #endif
 
-DECLHIDDEN(void) supR3HardenedOpenLog(int *pcArgs, char **papszArgs)
+DECL_HIDDEN_NOTHROW(void) supR3HardenedOpenLog(int *pcArgs, char **papszArgs) RT_NO_THROW_DEF
 {
     static const char s_szLogOption[] = "--sup-hardening-log=";
@@ -1477 +1477 @@
              * Drop the argument from the vector (has trailing NULL entry).
              */
-            memmove(&papszArgs[iArg], &papszArgs[iArg + 1], (cArgs - iArg) * sizeof(papszArgs[0]));
+//            memmove(&papszArgs[iArg], &papszArgs[iArg + 1], (cArgs - iArg) * sizeof(papszArgs[0]));
             *pcArgs -= 1;
             cArgs   -= 1;
@@ -1499 +1499 @@
                 if (RT_SUCCESS(rc))
                 {
-                    SUP_DPRINTF(("Log file opened: " VBOX_VERSION_STRING "r%u g_hStartupLog=%p g_uNtVerCombined=%#x\n",
-                                 VBOX_SVN_REV, g_hStartupLog, g_uNtVerCombined));
+//                    SUP_DPRINTF(("Log file opened: " VBOX_VERSION_STRING "r%u g_hStartupLog=%p g_uNtVerCombined=%#x\n",
+//                                 VBOX_SVN_REV, g_hStartupLog, g_uNtVerCombined));
 
                     /*
@@ -1508 +1508 @@
                     if (RT_C_IS_ALPHA(pszLogFile[0]) && pszLogFile[1] == ':')
                     {
-                        RTUtf16CopyAscii(g_wszStartupLogVol, RT_ELEMENTS(g_wszStartupLogVol), "\\??\\");
+//                        RTUtf16CopyAscii(g_wszStartupLogVol, RT_ELEMENTS(g_wszStartupLogVol), "\\??\\");
                         g_wszStartupLogVol[sizeof("\\??\\") - 1] = RT_C_TO_UPPER(pszLogFile[0]);
                         g_wszStartupLogVol[sizeof("\\??\\") + 0] = ':';
@@ -1527 +1527 @@
 
 
-DECLHIDDEN(void) supR3HardenedLogV(const char *pszFormat, va_list va)
+DECL_HIDDEN_NOTHROW(void) supR3HardenedLogV(const char *pszFormat, va_list va) RT_NO_THROW_DEF
 {
 #ifdef RT_OS_WINDOWS
@@ -1559 +1559 @@
 
 
-DECLHIDDEN(void) supR3HardenedLog(const char *pszFormat,  ...)
+DECL_HIDDEN_NOTHROW(void) supR3HardenedLog(const char *pszFormat,  ...) RT_NO_THROW_DEF
 {
     va_list va;
@@ -1568 +1568 @@
 
 
-DECLHIDDEN(void) supR3HardenedLogFlush(void)
+DECL_HIDDEN_NOTHROW(void) supR3HardenedLogFlush(void) RT_NO_THROW_DEF
 {
 #ifdef RT_OS_WINDOWS
@@ -1647 +1647 @@
 
 
-DECL_NO_RETURN(DECLHIDDEN(void)) supR3HardenedFatalMsgV(const char *pszWhere, SUPINITOP enmWhat, int rc,
-                                                        const char *pszMsgFmt, va_list va)
+DECL_NO_RETURN(DECL_HIDDEN_NOTHROW(void)) supR3HardenedFatalMsgV(const char *pszWhere, SUPINITOP enmWhat, int rc,
+                                                                 const char *pszMsgFmt, va_list va)
 {
     /*
@@ -1764 +1764 @@
 
 
-DECL_NO_RETURN(DECLHIDDEN(void)) supR3HardenedFatalMsg(const char *pszWhere, SUPINITOP enmWhat, int rc,
-                                                       const char *pszMsgFmt, ...)
+DECL_NO_RETURN(DECL_HIDDEN_NOTHROW(void)) supR3HardenedFatalMsg(const char *pszWhere, SUPINITOP enmWhat, int rc,
+                                                                const char *pszMsgFmt, ...)
 {
     va_list va;
@@ -1774 +1774 @@
 
 
-DECL_NO_RETURN(DECLHIDDEN(void)) supR3HardenedFatalV(const char *pszFormat, va_list va)
+DECL_NO_RETURN(DECL_HIDDEN_NOTHROW(void)) supR3HardenedFatalV(const char *pszFormat, va_list va)
 {
     supR3HardenedLog("Fatal error:\n");
@@ -1809 +1809 @@
 
 
-DECL_NO_RETURN(DECLHIDDEN(void)) supR3HardenedFatal(const char *pszFormat, ...)
+DECL_NO_RETURN(DECL_HIDDEN_NOTHROW(void)) supR3HardenedFatal(const char *pszFormat, ...)
 {
     va_list va;
@@ -1818 +1818 @@
 
 
-DECLHIDDEN(int) supR3HardenedErrorV(int rc, bool fFatal, const char *pszFormat, va_list va)
+DECL_HIDDEN_NOTHROW(int) supR3HardenedErrorV(int rc, bool fFatal, const char *pszFormat, va_list va)
 {
     if (fFatal)
@@ -1845 +1845 @@
 
 
-DECLHIDDEN(int) supR3HardenedError(int rc, bool fFatal, const char *pszFormat, ...)
+DECL_HIDDEN_NOTHROW(int) supR3HardenedError(int rc, bool fFatal, const char *pszFormat, ...)
 {
     va_list va;
@@ -1861 +1861 @@
  * @remarks This function will not return on failure.
  */
-DECLHIDDEN(void) supR3HardenedMainOpenDevice(void)
+DECL_HIDDEN_NOTHROW(void) supR3HardenedMainOpenDevice(void)
 {
     RTERRINFOSTATIC ErrInfo;
@@ -2516 +2516 @@
  * @param   envp            The environment vector.
  */
-DECLHIDDEN(int) SUPR3HardenedMain(const char *pszProgName, uint32_t fFlags, int argc, char **argv, char **envp)
+DECL_HIDDEN_NOTHROW(int) SUPR3HardenedMain(const char *pszProgName, uint32_t fFlags, int argc, char **argv, char **envp)
 {
     SUP_DPRINTF(("SUPR3HardenedMain: pszProgName=%s fFlags=%#x\n", pszProgName, fFlags));