Changeset 95834 in vbox

Timestamp:

Jul 26, 2022 2:46:59 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

152557

Message:

IPRT/nocrt: Call C & C++ initializers and terminators. TLS directory (not used by VBoxControl). bugref:10261

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (1 diff)
• common/compiler/vcc/initializers-c-cpp-vcc.cpp (added)
• common/compiler/vcc/loadcfg-vcc.c (modified) (4 diffs)
• common/compiler/vcc/tlsdir-vcc.c (added)
• include/internal/compiler-vcc.h (added)
• r3/win/nocrt-startup-exe-win.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -2305 +2305 @@
  RuntimeGuestR3_SOURCES.win += \
         common/compiler/vcc/loadcfg-vcc.c \
+        common/compiler/vcc/tlsdir-vcc.c \
+        common/compiler/vcc/initializers-c-cpp-vcc.cpp \
         common/compiler/vcc/stacksup-vcc.cpp \
         r3/win/nocrt-startup-exe-win.cpp \

trunk/src/VBox/Runtime/common/compiler/vcc/loadcfg-vcc.c

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - No-CRT - PE/Windows Load Configuration.
+ * IPRT - Visual C++ Compiler - PE/Windows Load Configuration.
  *
  * @note This is a C file and not C++ because the compiler generates fixups
@@ -35 +35 @@
 #include <iprt/formats/pecoff.h>
 
+#include "internal/compiler-vcc.h"
+
 
 /*********************************************************************************************************************************
@@ -64 +66 @@
 #endif
 
-extern RT_CONCAT(IMAGE_LOAD_CONFIG_DIRECTORY, ARCH_BITS) const  _load_config_used;
-
 
 /**
@@ -77 +77 @@
  *       the machinactions we include here for the 2019 (14.29.30139.0) linker.
  */
-const IMAGE_LOAD_CONFIG_DIRECTORY64 _load_config_used =
+RT_CONCAT(IMAGE_LOAD_CONFIG_DIRECTORY, ARCH_BITS) const _load_config_used =
 {
     /* .Size                                = */    sizeof(_load_config_used),

trunk/src/VBox/Runtime/r3/win/nocrt-startup-exe-win.cpp

@@ -45 +45 @@
 # include <iprt/nocrt/stdlib.h>
 #endif
+
+#include "internal/compiler-vcc.h"
 
 
@@ -158 +160 @@
             }
         }
+
+        rtVccInitializersRunTerm();
     }
 #else
@@ -203 +207 @@
     initProcExecPath();
 
-    /*
-     * Get and convert the command line to argc/argv format.
-     */
     RTEXITCODE rcExit;
-    UNICODE_STRING const *pCmdLine = pPeb->ProcessParameters ? &pPeb->ProcessParameters->CommandLine : NULL;
-    if (pCmdLine)
-    {
-        char *pszCmdLine = NULL;
-        int rc = RTUtf16ToUtf8Ex(pCmdLine->Buffer, pCmdLine->Length / sizeof(WCHAR), &pszCmdLine, 0, NULL);
-        if (RT_SUCCESS(rc))
-        {
-            char **papszArgv;
-            int    cArgs = 0;
-            rc = RTGetOptArgvFromString(&papszArgv, &cArgs, pszCmdLine,
-                                        RTGETOPTARGV_CNV_MODIFY_INPUT | RTGETOPTARGV_CNV_QUOTE_MS_CRT,  NULL);
+#ifdef IPRT_NO_CRT
+    AssertCompile(sizeof(rcExit) == sizeof(int));
+    rcExit = (RTEXITCODE)rtVccInitializersRunInit();
+    if (rcExit == RTEXITCODE_SUCCESS)
+#endif
+    {
+        /*
+         * Get and convert the command line to argc/argv format.
+         */
+        UNICODE_STRING const *pCmdLine = pPeb->ProcessParameters ? &pPeb->ProcessParameters->CommandLine : NULL;
+        if (pCmdLine)
+        {
+            char *pszCmdLine = NULL;
+            int rc = RTUtf16ToUtf8Ex(pCmdLine->Buffer, pCmdLine->Length / sizeof(WCHAR), &pszCmdLine, 0, NULL);
             if (RT_SUCCESS(rc))
             {
-                /*
-                 * Call the main function.
-                 */
-                AssertCompile(sizeof(rcExit) == sizeof(int));
-                rcExit = (RTEXITCODE)main(cArgs, papszArgv, NULL /*envp*/);
+                char **papszArgv;
+                int    cArgs = 0;
+                rc = RTGetOptArgvFromString(&papszArgv, &cArgs, pszCmdLine,
+                                            RTGETOPTARGV_CNV_MODIFY_INPUT | RTGETOPTARGV_CNV_QUOTE_MS_CRT,  NULL);
+                if (RT_SUCCESS(rc))
+                {
+                    /*
+                     * Call the main function.
+                     */
+                    AssertCompile(sizeof(rcExit) == sizeof(int));
+                    rcExit = (RTEXITCODE)main(cArgs, papszArgv, NULL /*envp*/);
+                }
+                else
+                    rcExit = RTMsgErrorExitFailure("Error parsing command line: %Rrc\n", rc);
             }
             else
-                rcExit = RTMsgErrorExitFailure("Error parsing command line: %Rrc\n", rc);
+                rcExit = RTMsgErrorExitFailure("Failed to convert command line to UTF-8: %Rrc\n", rc);
         }
         else
-            rcExit = RTMsgErrorExitFailure("Failed to convert command line to UTF-8: %Rrc\n", rc);
-    }
+            rcExit = RTMsgErrorExitFailure("No command line\n");
+        rtTerminateProcess(rcExit, true /*fDoAtExit*/);
+    }
+#ifdef IPRT_NO_CRT
     else
-        rcExit = RTMsgErrorExitFailure("No command line\n");
-
-    rtTerminateProcess(rcExit, true /*fDoAtExit*/);
-}
-
+    {
+        RTMsgError("A C static initializor failed (%d)\n", rcExit);
+        rtTerminateProcess(rcExit, false /*fDoAtExit*/);
+    }
+#endif
+}
+