Vincent Povirk : mscoree: Mono renamed mono_trace_set_assembly.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: bce8330f99003ec076881f0f415960e93117c896
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bce8330f99003ec076881f0f415960e93117c896

Author: Vincent Povirk <vincent at codeweavers.com>
Date:   Thu Oct  5 11:49:34 2017 -0500

mscoree: Mono renamed mono_trace_set_assembly.

Signed-off-by: Vincent Povirk <vincent at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/mscoree/corruntimehost.c  |  2 +-
 dlls/mscoree/metahost.c        | 10 ++++++++--
 dlls/mscoree/mscoree_private.h |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c
index eed96da..64f345d 100644
--- a/dlls/mscoree/corruntimehost.c
+++ b/dlls/mscoree/corruntimehost.c
@@ -1457,7 +1457,7 @@ __int32 WINAPI _CorExeMain(void)
 
             if (assembly)
             {
-                mono_trace_set_assembly(assembly);
+                mono_callspec_set_assembly(assembly);
 
                 exit_code = mono_jit_exec(domain, assembly, argc, argv);
             }
diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c
index bf70baa..0f88b0f 100644
--- a/dlls/mscoree/metahost.c
+++ b/dlls/mscoree/metahost.c
@@ -87,6 +87,7 @@ typedef void (CDECL *MonoProfilerRuntimeShutdownBeginCallback) (MonoProfiler *pr
 MonoImage* (CDECL *mono_assembly_get_image)(MonoAssembly *assembly);
 MonoAssembly* (CDECL *mono_assembly_load_from)(MonoImage *image, const char *fname, MonoImageOpenStatus *status);
 MonoAssembly* (CDECL *mono_assembly_open)(const char *filename, MonoImageOpenStatus *status);
+void (CDECL *mono_callspec_set_assembly)(MonoAssembly *assembly);
 MonoClass* (CDECL *mono_class_from_mono_type)(MonoType *type);
 MonoClass* (CDECL *mono_class_from_name)(MonoImage *image, const char* name_space, const char *name);
 MonoMethod* (CDECL *mono_class_get_method_from_name)(MonoClass *klass, const char *name, int param_count);
@@ -122,7 +123,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_trace_set_assembly)(MonoAssembly *assembly);
 void (CDECL *mono_trace_set_print_handler)(MonoPrintCallback callback);
 void (CDECL *mono_trace_set_printerr_handler)(MonoPrintCallback callback);
 
@@ -224,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_trace_set_assembly);
 
 #undef LOAD_MONO_FUNCTION
 
@@ -235,6 +234,7 @@ static HRESULT load_mono(LPCWSTR mono_path)
     } \
 } while (0);
 
+        LOAD_OPT_MONO_FUNCTION(mono_callspec_set_assembly, NULL);
         LOAD_OPT_MONO_FUNCTION(mono_image_open_from_module_handle, image_open_module_handle_dummy);
         LOAD_OPT_MONO_FUNCTION(mono_profiler_create, NULL);
         LOAD_OPT_MONO_FUNCTION(mono_profiler_install, NULL);
@@ -245,6 +245,12 @@ static HRESULT load_mono(LPCWSTR mono_path)
 
 #undef LOAD_OPT_MONO_FUNCTION
 
+        if (mono_callspec_set_assembly == NULL)
+        {
+            mono_callspec_set_assembly = (void*)GetProcAddress(mono_handle, "mono_trace_set_assembly");
+            if (!mono_callspec_set_assembly) goto fail;
+        }
+
         if (mono_profiler_create != NULL)
         {
             /* Profiler API v2 */
diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h
index 9df41d2..3f2aa70 100644
--- a/dlls/mscoree/mscoree_private.h
+++ b/dlls/mscoree/mscoree_private.h
@@ -142,6 +142,7 @@ extern BOOL is_mono_started DECLSPEC_HIDDEN;
 extern MonoImage* (CDECL *mono_assembly_get_image)(MonoAssembly *assembly) DECLSPEC_HIDDEN;
 extern MonoAssembly* (CDECL *mono_assembly_load_from)(MonoImage *image, const char *fname, MonoImageOpenStatus *status) DECLSPEC_HIDDEN;
 extern MonoAssembly* (CDECL *mono_assembly_open)(const char *filename, MonoImageOpenStatus *status) DECLSPEC_HIDDEN;
+extern void (CDECL *mono_callspec_set_assembly)(MonoAssembly *assembly) DECLSPEC_HIDDEN;
 extern MonoClass* (CDECL *mono_class_from_mono_type)(MonoType *type) DECLSPEC_HIDDEN;
 extern MonoClass* (CDECL *mono_class_from_name)(MonoImage *image, const char* name_space, const char *name) DECLSPEC_HIDDEN;
 extern MonoMethod* (CDECL *mono_class_get_method_from_name)(MonoClass *klass, const char *name, int param_count) DECLSPEC_HIDDEN;
@@ -165,7 +166,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_trace_set_assembly)(MonoAssembly *assembly) 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;