2004-10-31 Zoltan Varga <vargaz@freemail.hu>

	* appdomain.c (ves_icall_System_AppDomain_createDomain): Inherit
	application base from the root domain if not set. Fixes #65641.
	(mono_runtime_init): Fix warning.

svn path=/trunk/mono/; revision=35506

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index ee134a8b2c1548c5b0d7baaa07e9c42c124c1a26..cfd5cf79708f32e2289fc3c1da3568b1c3d6728a 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-31  Zoltan Varga  <vargaz@freemail.hu>
+
+       * appdomain.c (ves_icall_System_AppDomain_createDomain): Inherit
+       application base from the root domain if not set. Fixes #65641.
+       (mono_runtime_init): Fix warning.
+
 2004-10-29 Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * appdomain.c: call mono_thread_pool_init.

diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c
index 1b76ed79c7e0a23fedfaebac1c6b2e0258f7fe81..be77c729c06b290750f4863f66a95b55618afcc2 100644 (file)
--- a/mono/metadata/appdomain.c
+++ b/mono/metadata/appdomain.c
@@ -25,6 +25,7 @@
 #include <mono/metadata/tabledefs.h>
 #include <mono/metadata/gc-internal.h>
 #include <mono/metadata/marshal.h>
+#include <mono/metadata/threadpool.h>
 #include <mono/utils/mono-uri.h>
 
 #define MONO_CORLIB_VERSION 28
@@ -408,6 +409,12 @@ ves_icall_System_AppDomain_createDomain (MonoString *friendly_name, MonoAppDomai
        data->friendly_name = mono_string_to_utf8 (friendly_name);
        data->out_of_memory_ex = mono_exception_from_name_domain (data, mono_defaults.corlib, "System", "OutOfMemoryException");
 
+       if (!setup->application_base) {
+               /* Inherit from the root domain since MS.NET does this */
+               MonoDomain *root = mono_get_root_domain ();
+               setup->application_base = mono_string_new_utf16 (data, mono_string_chars (root->setup->application_base), mono_string_length (root->setup->application_base));
+       }
+
        mono_context_init (data);
 
        /* The new appdomain should have all assemblies loaded */