Exit with ExitProcess when using debug UCRT (#117187)

* Revert "Exit with quick_exit when using debug UCRT (#109006)"

This reverts commit e1d7398.

* Exit with ExitProcess when using debug UCRT

Co-authored-by: Jan Kotas <jkotas@microsoft.com>

Author: MichalStrehovsky

src/coreclr/nativeaot/Bootstrap/main.cpp

@@ -2,7 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 #include <stdint.h>
-#include <stdlib.h>
+
+#if defined(DEBUG) && defined(_WIN32)
+#include <process.h>
+#include <windows.h>
+#endif
 
 //
 // This is the mechanism whereby multiple linked modules contribute their global data for initialization at
@@ -107,16 +111,16 @@ void* PalGetModuleHandleFromPointer(void* pointer);
 #if defined(HOST_X86) && defined(HOST_WINDOWS)
 #define STRINGIFY(s) #s
 #define MANAGED_RUNTIME_EXPORT_ALTNAME(_method) STRINGIFY(/alternatename:_##_method=_method)
+#define MANAGED_RUNTIME_EXPORT_CALLCONV __cdecl
 #define MANAGED_RUNTIME_EXPORT(_name) \
     __pragma(comment (linker, MANAGED_RUNTIME_EXPORT_ALTNAME(_name))) \
-    extern "C" void __cdecl _name();
+    extern "C" void MANAGED_RUNTIME_EXPORT_CALLCONV _name();
 #define MANAGED_RUNTIME_EXPORT_NAME(_name) _name
-#define CDECL __cdecl
 #else
+#define MANAGED_RUNTIME_EXPORT_CALLCONV
 #define MANAGED_RUNTIME_EXPORT(_name) \
     extern "C" void _name();
 #define MANAGED_RUNTIME_EXPORT_NAME(_name) _name
-#define CDECL
 #endif
 
 MANAGED_RUNTIME_EXPORT(GetRuntimeException)
@@ -132,7 +136,7 @@ MANAGED_RUNTIME_EXPORT(ObjectiveCMarshalGetOnEnteredFinalizerQueueCallback)
 MANAGED_RUNTIME_EXPORT(ObjectiveCMarshalGetUnhandledExceptionPropagationHandler)
 #endif
 
-typedef void (CDECL *pfn)();
+typedef void (MANAGED_RUNTIME_EXPORT_CALLCONV *pfn)();
 
 static const pfn c_classlibFunctions[] = {
     &MANAGED_RUNTIME_EXPORT_NAME(GetRuntimeException),
@@ -210,7 +214,7 @@ static int InitializeRuntime()
 #ifndef NATIVEAOT_DLL
 
 #if defined(_WIN32)
-int CDECL wmain(int argc, wchar_t* argv[])
+int __cdecl wmain(int argc, wchar_t* argv[])
 #else
 int main(int argc, char* argv[])
 #endif
@@ -220,8 +224,10 @@ int main(int argc, char* argv[])
         return initval;
 
 #if defined(DEBUG) && defined(_WIN32)
-    // quick_exit works around Debug UCRT shutdown issues: https://github.com/dotnet/runtime/issues/108640
-    quick_exit(__managed__Main(argc, argv));
+    // work around Debug UCRT shutdown issues: https://github.com/dotnet/runtime/issues/108640
+    int exitCode = __managed__Main(argc, argv);
+    _cexit();
+    ExitProcess(exitCode);
 #else
     return __managed__Main(argc, argv);
 #endif

src/coreclr/nativeaot/Runtime/startup.cpp

@@ -350,10 +350,6 @@ extern "C" bool RhInitialize(bool isDll)
 #endif
 
 #if defined(HOST_WINDOWS) || defined(FEATURE_PERFTRACING)
-#if defined(DEBUG) && defined(HOST_WINDOWS)
-    // quick_exit works around Debug UCRT shutdown issues: https://github.com/dotnet/runtime/issues/108640
-    at_quick_exit(&OnProcessExit);
-#endif
     atexit(&OnProcessExit);
 #endif