Revert "mscoree: Call mono_thread_manage in GC Unsafe mode.".

This reverts commit d10f2c07. The bug we were working around has been fixed in upstream Mono and in Wine Mono 4.9.4. Signed-off-by: Vincent Povirk <vincent@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

Revert "mscoree: Call mono_thread_manage in GC Unsafe mode.".
1fddf230 · Vincent Povirk · Alexandre Julliard · b06d272d · 1fddf230 · 1fddf230
Commit 1fddf230 authored Nov 04, 2019 by Vincent Povirk Committed by Alexandre Julliard Nov 04, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

corruntimehost.c dlls/mscoree/corruntimehost.c +0 -2

metahost.c dlls/mscoree/metahost.c +0 -2

mscoree_private.h dlls/mscoree/mscoree_private.h +0 -1

No files found.
--- a/dlls/mscoree/corruntimehost.c
+++ b/dlls/mscoree/corruntimehost.c
@@ -1544,8 +1544,6 @@ __int32 WINAPI _CorExeMain(void)

    if (domain)
    {
-        int dummy;
-        mono_threads_enter_gc_unsafe_region(&dummy);
        mono_thread_manage();
        mono_runtime_quit();
    }

--- a/dlls/mscoree/metahost.c
+++ b/dlls/mscoree/metahost.c
@@ -124,7 +124,6 @@ MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str);
 static char* (CDECL *mono_stringify_assembly_name)(MonoAssemblyName *aname);
 MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain);
 void (CDECL *mono_thread_manage)(void);
-void (CDECL *mono_threads_enter_gc_unsafe_region)(void *stackdata);
 void (CDECL *mono_trace_set_print_handler)(MonoPrintCallback callback);
 void (CDECL *mono_trace_set_printerr_handler)(MonoPrintCallback callback);

@@ -225,7 +224,6 @@ static HRESULT load_mono(LPCWSTR mono_path)
        LOAD_MONO_FUNCTION(mono_string_new);
        LOAD_MONO_FUNCTION(mono_thread_attach);
        LOAD_MONO_FUNCTION(mono_thread_manage);
-        LOAD_MONO_FUNCTION(mono_threads_enter_gc_unsafe_region);

 #undef LOAD_MONO_FUNCTION


--- a/dlls/mscoree/mscoree_private.h
+++ b/dlls/mscoree/mscoree_private.h
@@ -177,7 +177,6 @@ extern void (CDECL *mono_runtime_quit)(void) DECLSPEC_HIDDEN;
 extern MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str) DECLSPEC_HIDDEN;
 extern MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain) DECLSPEC_HIDDEN;
 extern void (CDECL *mono_thread_manage)(void) DECLSPEC_HIDDEN;
-extern void (CDECL *mono_threads_enter_gc_unsafe_region)(void *stackdata) DECLSPEC_HIDDEN;
 extern void (CDECL *mono_trace_set_print_handler)(MonoPrintCallback callback) DECLSPEC_HIDDEN;
 extern void (CDECL *mono_trace_set_printerr_handler)(MonoPrintCallback callback) DECLSPEC_HIDDEN;