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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1fddf230ffff2b0946f6b9ae13648b454785e23e
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=1fddf230ffff2b0946f6b9ae1...

Author: Vincent Povirk 
Date:   Mon Nov  4 13:34:30 2019 -0600

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

This reverts commit d10f2c0723585da66a7b1e822e852ce54d56c5f1.

The bug we were working around has been fixed in upstream Mono and
in Wine Mono 4.9.4.

Signed-off-by: Vincent Povirk 
Signed-off-by: Alexandre Julliard

---

dlls/mscoree/corruntimehost.c  | 2 --
 dlls/mscoree/metahost.c        | 2 --
 dlls/mscoree/mscoree_private.h | 1 -
 3 files changed, 5 deletions(-)

diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c
index b72af709c0..e932a7f58b 100644
--- 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();
     }
diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c
index 575d6ce1d3..18232a4568 100644
--- 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

diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h
index 5847126b3e..d5f78b61f0 100644
--- 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;