From f7e7f757fc7db2e9c5f245b95cd041c4ddba1ff3 Mon Sep 17 00:00:00 2001 From: Vincent Povirk Date: Tue, 9 Nov 2010 09:15:44 -0600 Subject: [PATCH 01/18] mscoree: Report that all .NET versions are installed if Mono is missing. --- dlls/mscoree/metahost.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 0f28788..5506946 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -69,6 +69,12 @@ static CRITICAL_SECTION runtime_list_cs = { &runtime_list_cs_debug, -1, 0, 0, 0, static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) { /* FIXME: stub */ + if (This->mono_abi_version == -1) + MESSAGE("wine: Install the Windows version of Mono to run .NET executables\n"); + + if (This->mono_abi_version <= 0) + return E_FAIL; + *result = NULL; return S_OK; @@ -517,10 +523,15 @@ static void find_runtimes(void) } } - runtimes_initialized = 1; - if (!any_runtimes_found) - MESSAGE("wine: Install the Windows version of Mono to run .NET executables\n"); + { + /* Report all runtimes are available if Mono isn't installed. + * FIXME: Remove this when Mono is properly packaged. */ + for (i=0; i