Changeset 96388 in vbox for trunk/src/VBox/Runtime/r3/win

Timestamp:

Aug 20, 2022 11:08:15 PM (2 years ago)

Author:

vboxsync

Message:

IPRT/nocrt: Introduced an internal rtNoCrtFatalMsg/Write API to be used instead of RTMsgError and RTAssertMsg2 to report no-CRT init and runtime issues. The other two drags in hundreds of KBs of unnecessary code. bugref:10261

Location:

trunk/src/VBox/Runtime/r3/win

Files:

• nocrt-fatal-write-win.cpp (added)
• nocrt-mainCRTStartup-win.asm (modified) (1 diff)
• nocrt-startup-common-win.cpp (modified) (2 diffs)
• nocrt-startup-exe-win.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/r3/win/nocrt-mainCRTStartup-win.asm

@@ -28 +28 @@
 %include "iprt/asmdefs.mac"
 
-extern  CustomMainEntrypoint
+extern  NAME(CustomMainEntrypoint)
 BEGINPROC mainCRTStartup
-        jmp     CustomMainEntrypoint
+        jmp     NAME(CustomMainEntrypoint)
 ENDPROC   mainCRTStartup
 

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

@@ -29 +29 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#include "internal/iprt.h"
+#include "internal/nocrt.h"
 #include "internal/process.h"
 
 #include <iprt/nt/nt-and-windows.h>
+#ifndef IPRT_NOCRT_WITHOUT_FATAL_WRITE
+# include <iprt/assert.h>
+#endif
 #include <iprt/getopt.h>
 #include <iprt/message.h>
@@ -71 +74 @@
         }
         else
+        {
+#ifdef IPRT_NOCRT_WITHOUT_FATAL_WRITE
             RTMsgError("initProcExecPath: RTUtf16ToUtf8Ex failed: %Rrc\n", rc);
+#else
+            rtNoCrtFatalMsgWithRc(RT_STR_TUPLE("initProcExecPath: RTUtf16ToUtf8Ex failed: "), rc);
+#endif
+        }
     }
     else
+    {
+#ifdef IPRT_NOCRT_WITHOUT_FATAL_WRITE
         RTMsgError("initProcExecPath: GetModuleFileNameW failed: %Rhrc\n", GetLastError());
+#else
+        rtNoCrtFatalWriteBegin(RT_STR_TUPLE("initProcExecPath: GetModuleFileNameW failed: "));
+        rtNoCrtFatalWriteWinRc(GetLastError());
+        rtNoCrtFatalWrite(RT_STR_TUPLE("\r\n"));
+#endif
+    }
 }
 

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

@@ -31 +31 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#include "internal/iprt.h"
+#include "internal/nocrt.h"
 #include "internal/process.h"
 
@@ -98 +98 @@
          * Get and convert the command line to argc/argv format.
          */
+        rcExit = RTEXITCODE_INIT;
         UNICODE_STRING const *pCmdLine = pPeb->ProcessParameters ? &pPeb->ProcessParameters->CommandLine : NULL;
         if (pCmdLine)
@@ -118 +119 @@
                 }
                 else
-                    rcExit = RTMsgErrorExitFailure("Error parsing command line: %Rrc\n", rc);
+#ifdef IPRT_NOCRT_WITHOUT_FATAL_WRITE
+                    RTMsgError("Error parsing command line: %Rrc\n", rc);
+#else
+                    rtNoCrtFatalMsgWithRc(RT_STR_TUPLE("Error parsing command line: "), rc);
+#endif
             }
             else
-                rcExit = RTMsgErrorExitFailure("Failed to convert command line to UTF-8: %Rrc\n", rc);
+#ifdef IPRT_NOCRT_WITHOUT_FATAL_WRITE
+                RTMsgError("Failed to convert command line to UTF-8: %Rrc\n", rc);
+#else
+                rtNoCrtFatalMsgWithRc(RT_STR_TUPLE("Failed to convert command line to UTF-8: "), rc);
+#endif
         }
         else
-            rcExit = RTMsgErrorExitFailure("No command line\n");
+#ifdef IPRT_NOCRT_WITHOUT_FATAL_WRITE
+            RTMsgError("No command line\n");
+#else
+            rtNoCrtFatalMsg(RT_STR_TUPLE("No command line\r\n"));
+#endif
         rtTerminateProcess(rcExit, true /*fDoAtExit*/);
     }
@@ -130 +143 @@
     else
     {
+# ifdef IPRT_NOCRT_WITHOUT_FATAL_WRITE
         RTMsgError("A C static initializor failed (%d)\n", rcExit);
+# else
+        rtNoCrtFatalWriteBegin(RT_STR_TUPLE("A C static initializor failed ("));
+        rtNoCrtFatalWriteWinRc(rcExit);
+        rtNoCrtFatalWriteEnd(RT_STR_TUPLE("\r\n"));
+# endif
         rtTerminateProcess(rcExit, false /*fDoAtExit*/);
     }