Vincent Povirk : mscoree: Report that all . NET versions are installed if Mono is missing.

[Alexandre Julliard]

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

Author: Vincent Povirk <vincent(a)codeweavers.com>
Date:   Tue Nov  9 09:15:44 2010 -0600

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<NUM_RUNTIMES; i++)
+            runtimes[i].mono_abi_version = -1;
+    }
+
+    runtimes_initialized = 1;
 
 end:
     LeaveCriticalSection(&runtime_list_cs);