From 232a97930e01f294f3f8be2240f44eaaaa5364c2 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Mon, 30 Aug 2010 13:33:55 -0500 Subject: [PATCH 2/3] mscoree: Move the mono trace handling to the initialization. --- dlls/mscoree/mscoree_main.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index c363271..38f5efc 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -150,6 +150,8 @@ static HMODULE load_mono(void) WCHAR mono_path[MAX_PATH], mono_dll_path[MAX_PATH+16], mono_bin_path[MAX_PATH+4]; WCHAR mono_lib_path[MAX_PATH+4], mono_etc_path[MAX_PATH+4]; char mono_lib_path_a[MAX_PATH], mono_etc_path_a[MAX_PATH]; + int trace_size; + char trace_setting[256]; EnterCriticalSection(&mono_lib_cs); @@ -203,6 +205,13 @@ static HMODULE load_mono(void) mono_set_dirs(mono_lib_path_a, mono_etc_path_a); mono_config_parse(NULL); + + trace_size = GetEnvironmentVariableA("WINE_MONO_TRACE", trace_setting, sizeof(trace_setting)); + + if (trace_size) + { + mono_jit_set_trace_options(trace_setting); + } } end: @@ -314,8 +323,6 @@ static void get_utf8_args(int *argc, char ***argv) __int32 WINAPI _CorExeMain(void) { int exit_code; - int trace_size; - char trace_setting[256]; int argc; char **argv; MonoAssembly *assembly; @@ -328,13 +335,6 @@ __int32 WINAPI _CorExeMain(void) get_utf8_args(&argc, &argv); - trace_size = GetEnvironmentVariableA("WINE_MONO_TRACE", trace_setting, sizeof(trace_setting)); - - if (trace_size) - { - mono_jit_set_trace_options(trace_setting); - } - GetModuleFileNameA(NULL, filename, MAX_PATH); if (!default_domain) -- 1.7.0.4